From 747f5f1a239925958ba1e7dce3c422d4b42a6767 Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:09:43 -0400
Subject: Start implementing PostOptionsBottomSheetFragment. Rename some
 drawables.

---
 app/src/main/res/drawable-night/ic_about_24dp.xml  |  9 --------
 .../res/drawable-night/ic_about_day_night_24dp.xml |  9 ++++++++
 .../ic_access_time_day_night_24dp.xml              |  9 ++++++++
 .../res/drawable-night/ic_account_circle_24dp.xml  |  9 --------
 .../ic_account_circle_day_night_24dp.xml           |  9 ++++++++
 .../ic_add_a_photo_day_night_24dp.xml              |  9 ++++++++
 .../ic_add_circle_outline_day_night_24dp.xml       |  9 ++++++++
 .../main/res/drawable-night/ic_advanced_24dp.xml   | 12 -----------
 .../drawable-night/ic_advanced_day_night_24dp.xml  | 12 +++++++++++
 .../ic_amoled_theme_preference_24dp.xml            |  9 --------
 .../ic_amoled_theme_preference_day_night_24dp.xml  |  9 ++++++++
 .../main/res/drawable-night/ic_anonymous_24dp.xml  |  9 --------
 .../drawable-night/ic_anonymous_day_night_24dp.xml |  9 ++++++++
 .../main/res/drawable-night/ic_apply_to_24dp.xml   |  9 --------
 .../drawable-night/ic_apply_to_day_night_24dp.xml  |  9 ++++++++
 .../ic_arrow_downward_black_24dp.xml               |  9 --------
 .../ic_arrow_downward_day_night_24dp.xml           |  9 ++++++++
 .../drawable-night/ic_arrow_upward_black_24dp.xml  |  9 --------
 .../ic_arrow_upward_day_night_24dp.xml             |  9 ++++++++
 .../main/res/drawable-night/ic_bookmark_24dp.xml   |  9 --------
 .../res/drawable-night/ic_bookmark_border_24dp.xml |  9 --------
 .../ic_bookmark_border_day_night_24dp.xml          |  9 ++++++++
 .../drawable-night/ic_bookmark_day_night_24dp.xml  |  9 ++++++++
 .../drawable-night/ic_bookmarks_day_night_24dp.xml |  9 ++++++++
 .../ic_check_circle_day_night_24dp.xml             |  5 +++++
 .../ic_color_lens_day_night_24dp.xml               | 21 +++++++++++++++++++
 app/src/main/res/drawable-night/ic_copy_24dp.xml   |  9 --------
 .../res/drawable-night/ic_copy_day_night_24dp.xml  |  9 ++++++++
 .../ic_dark_theme_preference_24dp.xml              |  9 --------
 .../ic_dark_theme_preference_day_night_24dp.xml    |  9 ++++++++
 .../drawable-night/ic_data_saving_mode_24dp.xml    |  9 --------
 .../ic_data_saving_mode_day_night_24dp.xml         |  9 ++++++++
 app/src/main/res/drawable-night/ic_delete_24dp.xml |  9 --------
 .../drawable-night/ic_delete_day_night_24dp.xml    |  9 ++++++++
 .../main/res/drawable-night/ic_download_24dp.xml   |  9 --------
 .../drawable-night/ic_download_day_night_24dp.xml  |  9 ++++++++
 app/src/main/res/drawable-night/ic_edit_24dp.xml   |  9 --------
 .../res/drawable-night/ic_edit_day_night_24dp.xml  |  9 ++++++++
 .../drawable-night/ic_error_outline_black_24dp.xml |  9 --------
 .../ic_error_outline_black_day_night_24dp.xml      |  9 ++++++++
 app/src/main/res/drawable-night/ic_exit_24dp.xml   |  9 --------
 .../res/drawable-night/ic_exit_day_night_24dp.xml  |  9 ++++++++
 app/src/main/res/drawable-night/ic_filter_24dp.xml |  9 --------
 .../drawable-night/ic_filter_day_night_24dp.xml    |  9 ++++++++
 .../main/res/drawable-night/ic_font_size_24dp.xml  |  9 --------
 .../drawable-night/ic_font_size_day_night_24dp.xml |  9 ++++++++
 .../main/res/drawable-night/ic_gallery_24dp.xml    |  5 -----
 .../drawable-night/ic_gallery_day_night_24dp.xml   |  5 +++++
 .../main/res/drawable-night/ic_gesture_24dp.xml    |  9 --------
 .../drawable-night/ic_gesture_day_night_24dp.xml   |  9 ++++++++
 .../main/res/drawable-night/ic_give_award_24dp.xml |  9 --------
 .../ic_give_award_day_night_24dp.xml               |  9 ++++++++
 .../drawable-night/ic_hide_post_day_night_24dp.xml |  9 ++++++++
 .../res/drawable-night/ic_hide_read_posts_24dp.xml |  9 --------
 .../ic_hide_read_posts_day_night_24dp.xml          |  9 ++++++++
 .../main/res/drawable-night/ic_history_24dp.xml    |  9 --------
 .../drawable-night/ic_history_day_night_24dp.xml   |  9 ++++++++
 .../main/res/drawable-night/ic_home_black_24dp.xml |  9 --------
 .../res/drawable-night/ic_home_day_night_24dp.xml  |  9 ++++++++
 app/src/main/res/drawable-night/ic_image_24dp.xml  |  9 --------
 .../res/drawable-night/ic_image_day_night_24dp.xml |  9 ++++++++
 app/src/main/res/drawable-night/ic_inbox_24dp.xml  |  9 --------
 .../res/drawable-night/ic_inbox_day_night_24dp.xml |  9 ++++++++
 .../res/drawable-night/ic_info_preference_24dp.xml |  9 --------
 .../ic_info_preference_day_night_24dp.xml          |  9 ++++++++
 .../main/res/drawable-night/ic_interface_24dp.xml  |  9 --------
 .../drawable-night/ic_interface_day_night_24dp.xml |  9 ++++++++
 .../ic_keyboard_double_arrow_up_24.xml             | 12 -----------
 .../ic_keyboard_double_arrow_up_day_night_24dp.xml | 12 +++++++++++
 .../main/res/drawable-night/ic_language_24dp.xml   |  9 --------
 .../drawable-night/ic_language_day_night_24dp.xml  |  9 ++++++++
 .../ic_light_theme_preference_24dp.xml             |  9 --------
 .../ic_light_theme_preference_day_night_24dp.xml   |  9 ++++++++
 app/src/main/res/drawable-night/ic_link.xml        |  9 --------
 .../res/drawable-night/ic_link_day_night_24dp.xml  |  9 ++++++++
 .../drawable-night/ic_link_post_type_indicator.xml |  9 --------
 .../ic_link_post_type_indicator_day_night_24dp.xml |  9 ++++++++
 .../res/drawable-night/ic_lock_day_night_24dp.xml  |  9 ++++++++
 .../main/res/drawable-night/ic_log_out_24dp.xml    |  9 --------
 .../drawable-night/ic_log_out_day_night_24dp.xml   |  9 ++++++++
 .../res/drawable-night/ic_miscellaneous_24dp.xml   | 12 -----------
 .../ic_miscellaneous_day_night_24dp.xml            | 12 +++++++++++
 .../res/drawable-night/ic_multi_reddit_24dp.xml    |  9 --------
 .../ic_multi_reddit_day_night_24dp.xml             |  9 ++++++++
 .../drawable-night/ic_mute_preferences_24dp.xml    |  9 --------
 .../ic_mute_preferences_day_night_24dp.xml         |  9 ++++++++
 .../ic_notifications_day_night_24dp.xml            |  9 ++++++++
 .../main/res/drawable-night/ic_nsfw_off_24dp.xml   |  9 --------
 .../drawable-night/ic_nsfw_off_day_night_24dp.xml  |  9 ++++++++
 .../main/res/drawable-night/ic_nsfw_on_24dp.xml    |  9 --------
 .../drawable-night/ic_nsfw_on_day_night_24dp.xml   |  9 ++++++++
 .../main/res/drawable-night/ic_open_link_24dp.xml  |  9 --------
 .../drawable-night/ic_open_link_day_night_24dp.xml |  9 ++++++++
 .../drawable-night/ic_outline_access_time_24dp.xml |  9 --------
 .../ic_outline_add_a_photo_day_night_24dp.xml      |  9 --------
 .../ic_outline_add_circle_outline_24dp.xml         |  9 --------
 .../drawable-night/ic_outline_bookmarks_24dp.xml   |  9 --------
 .../drawable-night/ic_outline_color_lens_24dp.xml  | 21 -------------------
 .../res/drawable-night/ic_outline_lock_24dp.xml    |  9 --------
 .../ic_outline_notifications_24dp.xml              |  9 --------
 .../ic_outline_privacy_policy_24dp.xml             |  5 -----
 .../ic_outline_select_photo_day_night_24dp.xml     |  9 --------
 .../ic_outline_user_agreement_24dp.xml             |  5 -----
 .../res/drawable-night/ic_outline_video_24dp.xml   |  9 --------
 .../res/drawable-night/ic_playback_speed_24dp.xml  |  6 ------
 .../ic_playback_speed_day_night_24dp.xml           |  6 ++++++
 app/src/main/res/drawable-night/ic_poll_24dp.xml   |  9 --------
 .../res/drawable-night/ic_poll_day_night_24dp.xml  |  9 ++++++++
 .../res/drawable-night/ic_post_layout_24dp.xml     |  9 --------
 .../ic_post_layout_day_night_24dp.xml              |  9 ++++++++
 .../main/res/drawable-night/ic_preview_24dp.xml    |  9 --------
 .../drawable-night/ic_preview_day_night_24dp.xml   |  9 ++++++++
 .../ic_privacy_policy_day_night_24dp.xml           |  5 +++++
 app/src/main/res/drawable-night/ic_random_24dp.xml | 24 ----------------------
 .../drawable-night/ic_random_day_night_24dp.xml    | 24 ++++++++++++++++++++++
 .../main/res/drawable-night/ic_refresh_24dp.xml    |  9 --------
 .../drawable-night/ic_refresh_day_night_24dp.xml   |  9 ++++++++
 app/src/main/res/drawable-night/ic_reply_24dp.xml  |  4 ----
 .../res/drawable-night/ic_reply_day_night_24dp.xml |  4 ++++
 app/src/main/res/drawable-night/ic_report_24dp.xml | 15 --------------
 .../drawable-night/ic_report_day_night_24dp.xml    | 15 ++++++++++++++
 .../ic_round_check_circle_day_night_24dp.xml       |  5 -----
 .../drawable-night/ic_save_to_database_24dp.xml    |  9 --------
 .../ic_save_to_database_day_night_24dp.xml         |  9 ++++++++
 app/src/main/res/drawable-night/ic_search_24dp.xml |  5 -----
 .../drawable-night/ic_search_day_night_24dp.xml    |  5 +++++
 .../main/res/drawable-night/ic_security_24dp.xml   |  9 --------
 .../drawable-night/ic_security_day_night_24dp.xml  |  9 ++++++++
 .../ic_select_photo_day_night_24dp.xml             |  9 ++++++++
 .../main/res/drawable-night/ic_settings_24dp.xml   |  9 --------
 .../drawable-night/ic_settings_day_night_24dp.xml  |  9 ++++++++
 app/src/main/res/drawable-night/ic_share_24dp.xml  |  9 --------
 .../res/drawable-night/ic_share_day_night_24dp.xml |  9 ++++++++
 app/src/main/res/drawable-night/ic_sort_24dp.xml   |  9 --------
 .../res/drawable-night/ic_sort_day_night_24dp.xml  |  9 ++++++++
 .../res/drawable-night/ic_submit_post_24dp.xml     |  9 --------
 .../ic_submit_post_day_night_24dp.xml              |  9 ++++++++
 .../main/res/drawable-night/ic_subreddit_24dp.xml  |  9 --------
 .../drawable-night/ic_subreddit_day_night_24dp.xml |  9 ++++++++
 ...subscriptions_bottom_app_bar_day_night_24dp.xml |  9 ++++++++
 .../ic_subscritptions_bottom_app_bar_24dp.xml      |  9 --------
 app/src/main/res/drawable-night/ic_text_24dp.xml   |  9 --------
 .../res/drawable-night/ic_text_day_night_24dp.xml  |  9 ++++++++
 app/src/main/res/drawable-night/ic_user_24dp.xml   |  9 --------
 .../ic_user_agreement_day_night_24dp.xml           |  5 +++++
 .../res/drawable-night/ic_user_day_night_24dp.xml  |  9 ++++++++
 .../res/drawable-night/ic_video_day_night_24dp.xml |  9 ++++++++
 .../ic_wallpaper_both_black_24dp.xml               |  9 --------
 .../ic_wallpaper_both_day_night_24dp.xml           |  9 ++++++++
 .../ic_wallpaper_home_screen_black_24dp.xml        |  9 --------
 .../ic_wallpaper_home_screen_day_night_24dp.xml    |  9 ++++++++
 .../ic_wallpaper_lock_screen_black_24dp.xml        |  9 --------
 .../ic_wallpaper_lock_screen_day_night_24dp.xml    |  9 ++++++++
 153 files changed, 707 insertions(+), 698 deletions(-)
 delete mode 100644 app/src/main/res/drawable-night/ic_about_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_about_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_access_time_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_account_circle_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_account_circle_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_add_a_photo_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_add_circle_outline_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_advanced_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_advanced_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_amoled_theme_preference_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_amoled_theme_preference_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_anonymous_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_anonymous_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_apply_to_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_apply_to_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_arrow_downward_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_arrow_upward_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_bookmark_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_bookmark_border_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_bookmark_border_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_bookmark_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_bookmarks_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_check_circle_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_color_lens_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_copy_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_copy_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_dark_theme_preference_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_dark_theme_preference_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_data_saving_mode_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_data_saving_mode_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_delete_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_delete_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_download_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_download_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_edit_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_edit_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_error_outline_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_error_outline_black_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_exit_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_exit_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_filter_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_filter_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_font_size_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_font_size_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_gallery_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_gallery_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_gesture_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_gesture_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_give_award_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_give_award_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_hide_read_posts_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_hide_read_posts_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_history_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_history_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_home_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_home_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_image_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_image_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_inbox_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_inbox_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_info_preference_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_info_preference_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_interface_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_interface_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_24.xml
 create mode 100644 app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_language_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_language_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_light_theme_preference_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_light_theme_preference_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_link.xml
 create mode 100644 app/src/main/res/drawable-night/ic_link_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_link_post_type_indicator.xml
 create mode 100644 app/src/main/res/drawable-night/ic_link_post_type_indicator_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_lock_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_log_out_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_log_out_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_miscellaneous_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_miscellaneous_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_multi_reddit_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_mute_preferences_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_notifications_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_nsfw_off_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_nsfw_off_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_nsfw_on_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_nsfw_on_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_open_link_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_open_link_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_access_time_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_add_a_photo_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_add_circle_outline_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_lock_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_select_photo_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_outline_video_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_playback_speed_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_playback_speed_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_poll_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_poll_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_post_layout_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_post_layout_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_preview_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_preview_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_privacy_policy_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_random_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_random_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_refresh_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_refresh_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_reply_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_reply_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_report_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_report_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_round_check_circle_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_save_to_database_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_save_to_database_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_search_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_search_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_security_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_security_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_select_photo_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_settings_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_settings_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_share_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_share_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_sort_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_sort_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_submit_post_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_submit_post_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_subreddit_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_subreddit_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_subscriptions_bottom_app_bar_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_subscritptions_bottom_app_bar_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_text_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_text_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_user_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_user_agreement_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_user_day_night_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_video_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_wallpaper_both_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_wallpaper_both_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_wallpaper_home_screen_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_wallpaper_home_screen_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable-night/ic_wallpaper_lock_screen_black_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_wallpaper_lock_screen_day_night_24dp.xml

(limited to 'app/src/main/res/drawable-night')

diff --git a/app/src/main/res/drawable-night/ic_about_24dp.xml b/app/src/main/res/drawable-night/ic_about_24dp.xml
deleted file mode 100644
index e0580503..00000000
--- a/app/src/main/res/drawable-night/ic_about_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M11,18h2v-2h-2v2zM12,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,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_about_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_about_day_night_24dp.xml
new file mode 100644
index 00000000..e0580503
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_about_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M11,18h2v-2h-2v2zM12,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,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_access_time_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_access_time_day_night_24dp.xml
new file mode 100644
index 00000000..a846b915
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_access_time_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7L11,7v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_account_circle_24dp.xml b/app/src/main/res/drawable-night/ic_account_circle_24dp.xml
deleted file mode 100644
index cad8c2bc..00000000
--- a/app/src/main/res/drawable-night/ic_account_circle_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_account_circle_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_account_circle_day_night_24dp.xml
new file mode 100644
index 00000000..cad8c2bc
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_account_circle_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_add_a_photo_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_add_a_photo_day_night_24dp.xml
new file mode 100644
index 00000000..57869fc5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_add_a_photo_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M21,6h-3.17L16,4h-6v2h5.12l1.83,2L21,8v12L5,20v-9L3,11v9c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM8,14c0,2.76 2.24,5 5,5s5,-2.24 5,-5 -2.24,-5 -5,-5 -5,2.24 -5,5zM13,11c1.65,0 3,1.35 3,3s-1.35,3 -3,3 -3,-1.35 -3,-3 1.35,-3 3,-3zM5,6h3L8,4L5,4L5,1L3,1v3L0,4v2h3v3h2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_add_circle_outline_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_add_circle_outline_day_night_24dp.xml
new file mode 100644
index 00000000..8c721cf1
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_add_circle_outline_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,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-night/ic_advanced_24dp.xml b/app/src/main/res/drawable-night/ic_advanced_24dp.xml
deleted file mode 100644
index f4fbd6c9..00000000
--- a/app/src/main/res/drawable-night/ic_advanced_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M21.67,18.17l-5.3,-5.3h-0.99l-2.54,2.54v0.99l5.3,5.3c0.39,0.39 1.02,0.39 1.41,0l2.12,-2.12C22.06,19.2 22.06,18.56 21.67,18.17zM18.84,19.59l-4.24,-4.24l0.71,-0.71l4.24,4.24L18.84,19.59z"/>
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M17.34,10.19l1.41,-1.41l2.12,2.12c1.17,-1.17 1.17,-3.07 0,-4.24l-3.54,-3.54l-1.41,1.41V1.71L15.22,1l-3.54,3.54l0.71,0.71h2.83l-1.41,1.41l1.06,1.06l-2.89,2.89L7.85,6.48V5.06L4.83,2.04L2,4.87l3.03,3.03h1.41l4.13,4.13l-0.85,0.85H7.6l-5.3,5.3c-0.39,0.39 -0.39,1.02 0,1.41l2.12,2.12c0.39,0.39 1.02,0.39 1.41,0l5.3,-5.3v-2.12l5.15,-5.15L17.34,10.19zM9.36,15.34l-4.24,4.24l-0.71,-0.71l4.24,-4.24l0,0L9.36,15.34L9.36,15.34z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_advanced_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_advanced_day_night_24dp.xml
new file mode 100644
index 00000000..f4fbd6c9
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_advanced_day_night_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M21.67,18.17l-5.3,-5.3h-0.99l-2.54,2.54v0.99l5.3,5.3c0.39,0.39 1.02,0.39 1.41,0l2.12,-2.12C22.06,19.2 22.06,18.56 21.67,18.17zM18.84,19.59l-4.24,-4.24l0.71,-0.71l4.24,4.24L18.84,19.59z"/>
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M17.34,10.19l1.41,-1.41l2.12,2.12c1.17,-1.17 1.17,-3.07 0,-4.24l-3.54,-3.54l-1.41,1.41V1.71L15.22,1l-3.54,3.54l0.71,0.71h2.83l-1.41,1.41l1.06,1.06l-2.89,2.89L7.85,6.48V5.06L4.83,2.04L2,4.87l3.03,3.03h1.41l4.13,4.13l-0.85,0.85H7.6l-5.3,5.3c-0.39,0.39 -0.39,1.02 0,1.41l2.12,2.12c0.39,0.39 1.02,0.39 1.41,0l5.3,-5.3v-2.12l5.15,-5.15L17.34,10.19zM9.36,15.34l-4.24,4.24l-0.71,-0.71l4.24,-4.24l0,0L9.36,15.34L9.36,15.34z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_amoled_theme_preference_24dp.xml b/app/src/main/res/drawable-night/ic_amoled_theme_preference_24dp.xml
deleted file mode 100644
index 3eb4a608..00000000
--- a/app/src/main/res/drawable-night/ic_amoled_theme_preference_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M3,5A2,2 0,0 1,5 3H19A2,2 0,0 1,21 5V19A2,2 0,0 1,19 21H5C3.89,21 3,20.1 3,19V5M5,5V19H19V5H5M11,7H13A2,2 0,0 1,15 9V17H13V13H11V17H9V9A2,2 0,0 1,11 7M11,9V11H13V9H11Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_amoled_theme_preference_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_amoled_theme_preference_day_night_24dp.xml
new file mode 100644
index 00000000..3eb4a608
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_amoled_theme_preference_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M3,5A2,2 0,0 1,5 3H19A2,2 0,0 1,21 5V19A2,2 0,0 1,19 21H5C3.89,21 3,20.1 3,19V5M5,5V19H19V5H5M11,7H13A2,2 0,0 1,15 9V17H13V13H11V17H9V9A2,2 0,0 1,11 7M11,9V11H13V9H11Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_anonymous_24dp.xml b/app/src/main/res/drawable-night/ic_anonymous_24dp.xml
deleted file mode 100644
index 7a00ccf5..00000000
--- a/app/src/main/res/drawable-night/ic_anonymous_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-0.61 0.08,-1.21 0.21,-1.78L8.99,15v1c0,1.1 0.9,2 2,2v1.93C7.06,19.43 4,16.07 4,12zM17.89,17.4c-0.26,-0.81 -1,-1.4 -1.9,-1.4h-1v-3c0,-0.55 -0.45,-1 -1,-1h-6v-2h2c0.55,0 1,-0.45 1,-1L10.99,7h2c1.1,0 2,-0.9 2,-2v-0.41C17.92,5.77 20,8.65 20,12c0,2.08 -0.81,3.98 -2.11,5.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_anonymous_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_anonymous_day_night_24dp.xml
new file mode 100644
index 00000000..7a00ccf5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_anonymous_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-0.61 0.08,-1.21 0.21,-1.78L8.99,15v1c0,1.1 0.9,2 2,2v1.93C7.06,19.43 4,16.07 4,12zM17.89,17.4c-0.26,-0.81 -1,-1.4 -1.9,-1.4h-1v-3c0,-0.55 -0.45,-1 -1,-1h-6v-2h2c0.55,0 1,-0.45 1,-1L10.99,7h2c1.1,0 2,-0.9 2,-2v-0.41C17.92,5.77 20,8.65 20,12c0,2.08 -0.81,3.98 -2.11,5.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_apply_to_24dp.xml b/app/src/main/res/drawable-night/ic_apply_to_24dp.xml
deleted file mode 100644
index ee73a4df..00000000
--- a/app/src/main/res/drawable-night/ic_apply_to_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M11,11h2.12l6.16,-6.16l-2.12,-2.12L11,8.88V11zM20.71,2L20,1.29c-0.39,-0.39 -1.02,-0.39 -1.41,0l-0.72,0.72l2.12,2.12l0.72,-0.72C21.1,3.02 21.1,2.39 20.71,2zM17.9,9.05C17.96,9.41 18,9.79 18,10.2c0,1.71 -1.08,4.64 -6,9.14c-4.92,-4.49 -6,-7.43 -6,-9.14C6,6.17 9.09,4 12,4c0.32,0 0.65,0.03 0.97,0.08l1.65,-1.65C13.78,2.16 12.9,2 12,2c-4.2,0 -8,3.22 -8,8.2c0,3.32 2.67,7.25 8,11.8c5.33,-4.55 8,-8.48 8,-11.8c0,-1.01 -0.16,-1.94 -0.45,-2.8L17.9,9.05z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_apply_to_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_apply_to_day_night_24dp.xml
new file mode 100644
index 00000000..ee73a4df
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_apply_to_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,11h2.12l6.16,-6.16l-2.12,-2.12L11,8.88V11zM20.71,2L20,1.29c-0.39,-0.39 -1.02,-0.39 -1.41,0l-0.72,0.72l2.12,2.12l0.72,-0.72C21.1,3.02 21.1,2.39 20.71,2zM17.9,9.05C17.96,9.41 18,9.79 18,10.2c0,1.71 -1.08,4.64 -6,9.14c-4.92,-4.49 -6,-7.43 -6,-9.14C6,6.17 9.09,4 12,4c0.32,0 0.65,0.03 0.97,0.08l1.65,-1.65C13.78,2.16 12.9,2 12,2c-4.2,0 -8,3.22 -8,8.2c0,3.32 2.67,7.25 8,11.8c5.33,-4.55 8,-8.48 8,-11.8c0,-1.01 -0.16,-1.94 -0.45,-2.8L17.9,9.05z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml
deleted file mode 100644
index 90611a60..00000000
--- a/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"
-      android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_downward_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_downward_day_night_24dp.xml
new file mode 100644
index 00000000..90611a60
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_arrow_downward_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"
+      android:fillColor="#FFFFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml
deleted file mode 100644
index b7323a1e..00000000
--- a/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_upward_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_upward_day_night_24dp.xml
new file mode 100644
index 00000000..b7323a1e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_arrow_upward_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_bookmark_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark_24dp.xml
deleted file mode 100644
index edee7cf9..00000000
--- a/app/src/main/res/drawable-night/ic_bookmark_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_bookmark_border_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark_border_24dp.xml
deleted file mode 100644
index f41f953b..00000000
--- a/app/src/main/res/drawable-night/ic_bookmark_border_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_bookmark_border_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark_border_day_night_24dp.xml
new file mode 100644
index 00000000..f41f953b
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_bookmark_border_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_bookmark_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark_day_night_24dp.xml
new file mode 100644
index 00000000..edee7cf9
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_bookmark_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_bookmarks_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_bookmarks_day_night_24dp.xml
new file mode 100644
index 00000000..dc287190
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_bookmarks_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M15,7v12.97l-4.21,-1.81 -0.79,-0.34 -0.79,0.34L5,19.97L5,7h10m4,-6L8.99,1C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13l2,1L21,3c0,-1.1 -0.9,-2 -2,-2zM15,5L5,5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L17,7c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_check_circle_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_check_circle_day_night_24dp.xml
new file mode 100644
index 00000000..d11c68bf
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_check_circle_day_night_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,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,8zM15.88,8.29L10,14.17l-1.88,-1.88c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l2.59,2.59c0.39,0.39 1.02,0.39 1.41,0L17.3,9.7c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.03,-0.39 -1.42,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_color_lens_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_color_lens_day_night_24dp.xml
new file mode 100644
index 00000000..6fa0d26f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_color_lens_day_night_24dp.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.12 0.05,0.23 0.13,0.33 0.41,0.47 0.64,1.06 0.64,1.67 0,1.38 -1.12,2.5 -2.5,2.5zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5 0,-0.16 -0.08,-0.28 -0.14,-0.35 -0.41,-0.46 -0.63,-1.05 -0.63,-1.65 0,-1.38 1.12,-2.5 2.5,-2.5L16,15c2.21,0 4,-1.79 4,-4 0,-3.86 -3.59,-7 -8,-7z"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M9.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M14.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M17.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_copy_24dp.xml b/app/src/main/res/drawable-night/ic_copy_24dp.xml
deleted file mode 100644
index 00d23548..00000000
--- a/app/src/main/res/drawable-night/ic_copy_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_copy_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_copy_day_night_24dp.xml
new file mode 100644
index 00000000..00d23548
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_copy_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_dark_theme_preference_24dp.xml b/app/src/main/res/drawable-night/ic_dark_theme_preference_24dp.xml
deleted file mode 100644
index 3ea2743e..00000000
--- a/app/src/main/res/drawable-night/ic_dark_theme_preference_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12.7,4.91C15.25,6.24 17,8.92 17,12s-1.75,5.76 -4.3,7.09c1.46,-2 2.3,-4.46 2.3,-7.09s-0.84,-5.09 -2.3,-7.09M9,2c-1.05,0 -2.05,0.16 -3,0.46 4.06,1.27 7,5.06 7,9.54s-2.94,8.27 -7,9.54c0.95,0.3 1.95,0.46 3,0.46 5.52,0 10,-4.48 10,-10S14.52,2 9,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_dark_theme_preference_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_dark_theme_preference_day_night_24dp.xml
new file mode 100644
index 00000000..3ea2743e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_dark_theme_preference_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12.7,4.91C15.25,6.24 17,8.92 17,12s-1.75,5.76 -4.3,7.09c1.46,-2 2.3,-4.46 2.3,-7.09s-0.84,-5.09 -2.3,-7.09M9,2c-1.05,0 -2.05,0.16 -3,0.46 4.06,1.27 7,5.06 7,9.54s-2.94,8.27 -7,9.54c0.95,0.3 1.95,0.46 3,0.46 5.52,0 10,-4.48 10,-10S14.52,2 9,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_data_saving_mode_24dp.xml b/app/src/main/res/drawable-night/ic_data_saving_mode_24dp.xml
deleted file mode 100644
index 49d83ff8..00000000
--- a/app/src/main/res/drawable-night/ic_data_saving_mode_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_data_saving_mode_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_data_saving_mode_day_night_24dp.xml
new file mode 100644
index 00000000..49d83ff8
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_data_saving_mode_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_delete_24dp.xml b/app/src/main/res/drawable-night/ic_delete_24dp.xml
deleted file mode 100644
index 4169cae5..00000000
--- a/app/src/main/res/drawable-night/ic_delete_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M14.12,10.47L12,12.59l-2.13,-2.12 -1.41,1.41L10.59,14l-2.12,2.12 1.41,1.41L12,15.41l2.12,2.12 1.41,-1.41L13.41,14l2.12,-2.12zM15.5,4l-1,-1h-5l-1,1H5v2h14V4zM6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM8,9h8v10H8V9z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_delete_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_delete_day_night_24dp.xml
new file mode 100644
index 00000000..4169cae5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_delete_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M14.12,10.47L12,12.59l-2.13,-2.12 -1.41,1.41L10.59,14l-2.12,2.12 1.41,1.41L12,15.41l2.12,2.12 1.41,-1.41L13.41,14l2.12,-2.12zM15.5,4l-1,-1h-5l-1,1H5v2h14V4zM6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM8,9h8v10H8V9z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_download_24dp.xml b/app/src/main/res/drawable-night/ic_download_24dp.xml
deleted file mode 100644
index eb39e3f3..00000000
--- a/app/src/main/res/drawable-night/ic_download_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13,5v6h1.17L12,13.17 9.83,11L11,11L11,5h2m2,-2L9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_download_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_download_day_night_24dp.xml
new file mode 100644
index 00000000..eb39e3f3
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_download_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,5v6h1.17L12,13.17 9.83,11L11,11L11,5h2m2,-2L9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_edit_24dp.xml b/app/src/main/res/drawable-night/ic_edit_24dp.xml
deleted file mode 100644
index 7f32de65..00000000
--- a/app/src/main/res/drawable-night/ic_edit_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_edit_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_edit_day_night_24dp.xml
new file mode 100644
index 00000000..7f32de65
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_edit_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_error_outline_black_24dp.xml b/app/src/main/res/drawable-night/ic_error_outline_black_24dp.xml
deleted file mode 100644
index e7d3eb31..00000000
--- a/app/src/main/res/drawable-night/ic_error_outline_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_error_outline_black_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_error_outline_black_day_night_24dp.xml
new file mode 100644
index 00000000..e7d3eb31
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_error_outline_black_day_night_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="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_exit_24dp.xml b/app/src/main/res/drawable-night/ic_exit_24dp.xml
deleted file mode 100644
index ce5bd595..00000000
--- a/app/src/main/res/drawable-night/ic_exit_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_exit_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_exit_day_night_24dp.xml
new file mode 100644
index 00000000..ce5bd595
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_exit_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_filter_24dp.xml b/app/src/main/res/drawable-night/ic_filter_24dp.xml
deleted file mode 100644
index 641119c4..00000000
--- a/app/src/main/res/drawable-night/ic_filter_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M7,6h10l-5.01,6.3L7,6zM4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_filter_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_filter_day_night_24dp.xml
new file mode 100644
index 00000000..641119c4
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_filter_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M7,6h10l-5.01,6.3L7,6zM4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_font_size_24dp.xml b/app/src/main/res/drawable-night/ic_font_size_24dp.xml
deleted file mode 100644
index 44c361be..00000000
--- a/app/src/main/res/drawable-night/ic_font_size_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_font_size_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_font_size_day_night_24dp.xml
new file mode 100644
index 00000000..44c361be
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_font_size_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_gallery_24dp.xml b/app/src/main/res/drawable-night/ic_gallery_24dp.xml
deleted file mode 100644
index d54dba10..00000000
--- a/app/src/main/res/drawable-night/ic_gallery_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,4v12L8,16L8,4h12m0,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM11.5,11.67l1.69,2.26 2.48,-3.1L19,15L9,15zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_gallery_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_gallery_day_night_24dp.xml
new file mode 100644
index 00000000..d54dba10
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_gallery_day_night_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,4v12L8,16L8,4h12m0,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM11.5,11.67l1.69,2.26 2.48,-3.1L19,15L9,15zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_gesture_24dp.xml b/app/src/main/res/drawable-night/ic_gesture_24dp.xml
deleted file mode 100644
index 4ad8e70e..00000000
--- a/app/src/main/res/drawable-night/ic_gesture_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_gesture_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_gesture_day_night_24dp.xml
new file mode 100644
index 00000000..4ad8e70e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_gesture_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_give_award_24dp.xml b/app/src/main/res/drawable-night/ic_give_award_24dp.xml
deleted file mode 100644
index cb3c05a5..00000000
--- a/app/src/main/res/drawable-night/ic_give_award_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M22,10L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2zM20,8.54c-1.19,0.69 -2,1.99 -2,3.46s0.81,2.77 2,3.46L20,18L4,18v-2.54c1.19,-0.69 2,-1.99 2,-3.46 0,-1.48 -0.8,-2.77 -1.99,-3.46L4,6h16v2.54zM9.07,16L12,14.12 14.93,16l-0.89,-3.36 2.69,-2.2 -3.47,-0.21L12,7l-1.27,3.22 -3.47,0.21 2.69,2.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_give_award_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_give_award_day_night_24dp.xml
new file mode 100644
index 00000000..cb3c05a5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_give_award_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M22,10L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2zM20,8.54c-1.19,0.69 -2,1.99 -2,3.46s0.81,2.77 2,3.46L20,18L4,18v-2.54c1.19,-0.69 2,-1.99 2,-3.46 0,-1.48 -0.8,-2.77 -1.99,-3.46L4,6h16v2.54zM9.07,16L12,14.12 14.93,16l-0.89,-3.36 2.69,-2.2 -3.47,-0.21L12,7l-1.27,3.22 -3.47,0.21 2.69,2.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml
new file mode 100644
index 00000000..a00a0d8c
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_hide_post_day_night_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m791,905 l-91,-91q-49,32 -104.5,49T480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-60 17,-115.5T146,260l-91,-91 57,-57 736,736 -57,57ZM480,800q43,0 83.5,-11t78.5,-33L204,318q-22,38 -33,78.5T160,480q0,133 93.5,226.5T480,800ZM814,700 L756,642q22,-38 33,-78.5t11,-83.5q0,-133 -93.5,-226.5T480,160q-43,0 -83.5,11T318,204l-58,-58q49,-32 104.5,-49T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,60 -17,115.5T814,700ZM537,423ZM423,537Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_hide_read_posts_24dp.xml b/app/src/main/res/drawable-night/ic_hide_read_posts_24dp.xml
deleted file mode 100644
index ea2c937f..00000000
--- a/app/src/main/res/drawable-night/ic_hide_read_posts_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_hide_read_posts_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_hide_read_posts_day_night_24dp.xml
new file mode 100644
index 00000000..ea2c937f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_hide_read_posts_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_history_24dp.xml b/app/src/main/res/drawable-night/ic_history_24dp.xml
deleted file mode 100644
index af91e161..00000000
--- a/app/src/main/res/drawable-night/ic_history_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      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"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_history_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_history_day_night_24dp.xml
new file mode 100644
index 00000000..af91e161
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_history_day_night_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"
+    android:viewportHeight="24">
+  <path
+      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"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_home_black_24dp.xml b/app/src/main/res/drawable-night/ic_home_black_24dp.xml
deleted file mode 100644
index c112c91b..00000000
--- a/app/src/main/res/drawable-night/ic_home_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_home_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_home_day_night_24dp.xml
new file mode 100644
index 00000000..c112c91b
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_home_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_image_24dp.xml b/app/src/main/res/drawable-night/ic_image_24dp.xml
deleted file mode 100644
index 6f61394f..00000000
--- a/app/src/main/res/drawable-night/ic_image_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_image_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_image_day_night_24dp.xml
new file mode 100644
index 00000000..6f61394f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_image_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_inbox_24dp.xml b/app/src/main/res/drawable-night/ic_inbox_24dp.xml
deleted file mode 100644
index cc3f203c..00000000
--- a/app/src/main/res/drawable-night/ic_inbox_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19v-3h3.56c0.69,1.19 1.97,2 3.45,2s2.75,-0.81 3.45,-2L19,16v3zM19,14h-4.99c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2L5,14L5,5h14v9z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_inbox_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_inbox_day_night_24dp.xml
new file mode 100644
index 00000000..cc3f203c
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_inbox_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19v-3h3.56c0.69,1.19 1.97,2 3.45,2s2.75,-0.81 3.45,-2L19,16v3zM19,14h-4.99c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2L5,14L5,5h14v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_info_preference_24dp.xml b/app/src/main/res/drawable-night/ic_info_preference_24dp.xml
deleted file mode 100644
index 10088cff..00000000
--- a/app/src/main/res/drawable-night/ic_info_preference_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,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"
-      android:fillColor="#4DFFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_info_preference_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_info_preference_day_night_24dp.xml
new file mode 100644
index 00000000..10088cff
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_info_preference_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,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"
+      android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_interface_24dp.xml b/app/src/main/res/drawable-night/ic_interface_24dp.xml
deleted file mode 100644
index 633b54cb..00000000
--- a/app/src/main/res/drawable-night/ic_interface_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_interface_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_interface_day_night_24dp.xml
new file mode 100644
index 00000000..633b54cb
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_interface_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_24.xml b/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_24.xml
deleted file mode 100644
index cea7e80b..00000000
--- a/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,17.59l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,11l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_day_night_24dp.xml
new file mode 100644
index 00000000..cea7e80b
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_keyboard_double_arrow_up_day_night_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,17.59l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,11l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_language_24dp.xml b/app/src/main/res/drawable-night/ic_language_24dp.xml
deleted file mode 100644
index e6e0586d..00000000
--- a/app/src/main/res/drawable-night/ic_language_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_language_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_language_day_night_24dp.xml
new file mode 100644
index 00000000..e6e0586d
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_language_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_light_theme_preference_24dp.xml b/app/src/main/res/drawable-night/ic_light_theme_preference_24dp.xml
deleted file mode 100644
index 8a7d0fe8..00000000
--- a/app/src/main/res/drawable-night/ic_light_theme_preference_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM18,14.48L18,18h-3.52L12,20.48 9.52,18L6,18v-3.52L3.52,12 6,9.52L6,6h3.52L12,3.52 14.48,6L18,6v3.52L20.48,12 18,14.48zM12,6.5c-3.03,0 -5.5,2.47 -5.5,5.5s2.47,5.5 5.5,5.5 5.5,-2.47 5.5,-5.5 -2.47,-5.5 -5.5,-5.5zM12,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-night/ic_light_theme_preference_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_light_theme_preference_day_night_24dp.xml
new file mode 100644
index 00000000..8a7d0fe8
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_light_theme_preference_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM18,14.48L18,18h-3.52L12,20.48 9.52,18L6,18v-3.52L3.52,12 6,9.52L6,6h3.52L12,3.52 14.48,6L18,6v3.52L20.48,12 18,14.48zM12,6.5c-3.03,0 -5.5,2.47 -5.5,5.5s2.47,5.5 5.5,5.5 5.5,-2.47 5.5,-5.5 -2.47,-5.5 -5.5,-5.5zM12,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-night/ic_link.xml b/app/src/main/res/drawable-night/ic_link.xml
deleted file mode 100644
index 720bb7c5..00000000
--- a/app/src/main/res/drawable-night/ic_link.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M17,7h-4v2h4c1.65,0 3,1.35 3,3s-1.35,3 -3,3h-4v2h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5zM11,15L7,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-2zM8,11h8v2L8,13z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_link_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_link_day_night_24dp.xml
new file mode 100644
index 00000000..720bb7c5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_link_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M17,7h-4v2h4c1.65,0 3,1.35 3,3s-1.35,3 -3,3h-4v2h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5zM11,15L7,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-2zM8,11h8v2L8,13z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_link_post_type_indicator.xml b/app/src/main/res/drawable-night/ic_link_post_type_indicator.xml
deleted file mode 100644
index 4b447423..00000000
--- a/app/src/main/res/drawable-night/ic_link_post_type_indicator.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#000000"
-      android:pathData="M17,7h-4v2h4c1.65,0 3,1.35 3,3s-1.35,3 -3,3h-4v2h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5zM11,15L7,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-2zM8,11h8v2L8,13z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_link_post_type_indicator_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_link_post_type_indicator_day_night_24dp.xml
new file mode 100644
index 00000000..4b447423
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_link_post_type_indicator_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000000"
+      android:pathData="M17,7h-4v2h4c1.65,0 3,1.35 3,3s-1.35,3 -3,3h-4v2h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5zM11,15L7,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-2zM8,11h8v2L8,13z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_lock_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_lock_day_night_24dp.xml
new file mode 100644
index 00000000..d4968533
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_lock_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_log_out_24dp.xml b/app/src/main/res/drawable-night/ic_log_out_24dp.xml
deleted file mode 100644
index 4885d221..00000000
--- a/app/src/main/res/drawable-night/ic_log_out_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_log_out_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_log_out_day_night_24dp.xml
new file mode 100644
index 00000000..4885d221
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_log_out_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_miscellaneous_24dp.xml b/app/src/main/res/drawable-night/ic_miscellaneous_24dp.xml
deleted file mode 100644
index 52a52180..00000000
--- a/app/src/main/res/drawable-night/ic_miscellaneous_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M14.17,13.71l1.4,-2.42c0.09,-0.15 0.05,-0.34 -0.08,-0.45l-1.48,-1.16c0.03,-0.22 0.05,-0.45 0.05,-0.68s-0.02,-0.46 -0.05,-0.69l1.48,-1.16c0.13,-0.11 0.17,-0.3 0.08,-0.45l-1.4,-2.42c-0.09,-0.15 -0.27,-0.21 -0.43,-0.15L12,4.83c-0.36,-0.28 -0.75,-0.51 -1.18,-0.69l-0.26,-1.85C10.53,2.13 10.38,2 10.21,2h-2.8C7.24,2 7.09,2.13 7.06,2.3L6.8,4.15C6.38,4.33 5.98,4.56 5.62,4.84l-1.74,-0.7c-0.16,-0.06 -0.34,0 -0.43,0.15l-1.4,2.42C1.96,6.86 2,7.05 2.13,7.16l1.48,1.16C3.58,8.54 3.56,8.77 3.56,9s0.02,0.46 0.05,0.69l-1.48,1.16C2,10.96 1.96,11.15 2.05,11.3l1.4,2.42c0.09,0.15 0.27,0.21 0.43,0.15l1.74,-0.7c0.36,0.28 0.75,0.51 1.18,0.69l0.26,1.85C7.09,15.87 7.24,16 7.41,16h2.8c0.17,0 0.32,-0.13 0.35,-0.3l0.26,-1.85c0.42,-0.18 0.82,-0.41 1.18,-0.69l1.74,0.7C13.9,13.92 14.08,13.86 14.17,13.71zM8.81,11c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C10.81,10.1 9.91,11 8.81,11z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M21.92,18.67l-0.96,-0.74c0.02,-0.14 0.04,-0.29 0.04,-0.44c0,-0.15 -0.01,-0.3 -0.04,-0.44l0.95,-0.74c0.08,-0.07 0.11,-0.19 0.05,-0.29l-0.9,-1.55c-0.05,-0.1 -0.17,-0.13 -0.28,-0.1l-1.11,0.45c-0.23,-0.18 -0.48,-0.33 -0.76,-0.44l-0.17,-1.18C18.73,13.08 18.63,13 18.53,13h-1.79c-0.11,0 -0.21,0.08 -0.22,0.19l-0.17,1.18c-0.27,0.12 -0.53,0.26 -0.76,0.44l-1.11,-0.45c-0.1,-0.04 -0.22,0 -0.28,0.1l-0.9,1.55c-0.05,0.1 -0.04,0.22 0.05,0.29l0.95,0.74c-0.02,0.14 -0.03,0.29 -0.03,0.44c0,0.15 0.01,0.3 0.03,0.44l-0.95,0.74c-0.08,0.07 -0.11,0.19 -0.05,0.29l0.9,1.55c0.05,0.1 0.17,0.13 0.28,0.1l1.11,-0.45c0.23,0.18 0.48,0.33 0.76,0.44l0.17,1.18c0.02,0.11 0.11,0.19 0.22,0.19h1.79c0.11,0 0.21,-0.08 0.22,-0.19l0.17,-1.18c0.27,-0.12 0.53,-0.26 0.75,-0.44l1.12,0.45c0.1,0.04 0.22,0 0.28,-0.1l0.9,-1.55C22.03,18.86 22,18.74 21.92,18.67zM17.63,18.83c-0.74,0 -1.35,-0.6 -1.35,-1.35s0.6,-1.35 1.35,-1.35s1.35,0.6 1.35,1.35S18.37,18.83 17.63,18.83z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_miscellaneous_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_miscellaneous_day_night_24dp.xml
new file mode 100644
index 00000000..52a52180
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_miscellaneous_day_night_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.17,13.71l1.4,-2.42c0.09,-0.15 0.05,-0.34 -0.08,-0.45l-1.48,-1.16c0.03,-0.22 0.05,-0.45 0.05,-0.68s-0.02,-0.46 -0.05,-0.69l1.48,-1.16c0.13,-0.11 0.17,-0.3 0.08,-0.45l-1.4,-2.42c-0.09,-0.15 -0.27,-0.21 -0.43,-0.15L12,4.83c-0.36,-0.28 -0.75,-0.51 -1.18,-0.69l-0.26,-1.85C10.53,2.13 10.38,2 10.21,2h-2.8C7.24,2 7.09,2.13 7.06,2.3L6.8,4.15C6.38,4.33 5.98,4.56 5.62,4.84l-1.74,-0.7c-0.16,-0.06 -0.34,0 -0.43,0.15l-1.4,2.42C1.96,6.86 2,7.05 2.13,7.16l1.48,1.16C3.58,8.54 3.56,8.77 3.56,9s0.02,0.46 0.05,0.69l-1.48,1.16C2,10.96 1.96,11.15 2.05,11.3l1.4,2.42c0.09,0.15 0.27,0.21 0.43,0.15l1.74,-0.7c0.36,0.28 0.75,0.51 1.18,0.69l0.26,1.85C7.09,15.87 7.24,16 7.41,16h2.8c0.17,0 0.32,-0.13 0.35,-0.3l0.26,-1.85c0.42,-0.18 0.82,-0.41 1.18,-0.69l1.74,0.7C13.9,13.92 14.08,13.86 14.17,13.71zM8.81,11c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C10.81,10.1 9.91,11 8.81,11z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M21.92,18.67l-0.96,-0.74c0.02,-0.14 0.04,-0.29 0.04,-0.44c0,-0.15 -0.01,-0.3 -0.04,-0.44l0.95,-0.74c0.08,-0.07 0.11,-0.19 0.05,-0.29l-0.9,-1.55c-0.05,-0.1 -0.17,-0.13 -0.28,-0.1l-1.11,0.45c-0.23,-0.18 -0.48,-0.33 -0.76,-0.44l-0.17,-1.18C18.73,13.08 18.63,13 18.53,13h-1.79c-0.11,0 -0.21,0.08 -0.22,0.19l-0.17,1.18c-0.27,0.12 -0.53,0.26 -0.76,0.44l-1.11,-0.45c-0.1,-0.04 -0.22,0 -0.28,0.1l-0.9,1.55c-0.05,0.1 -0.04,0.22 0.05,0.29l0.95,0.74c-0.02,0.14 -0.03,0.29 -0.03,0.44c0,0.15 0.01,0.3 0.03,0.44l-0.95,0.74c-0.08,0.07 -0.11,0.19 -0.05,0.29l0.9,1.55c0.05,0.1 0.17,0.13 0.28,0.1l1.11,-0.45c0.23,0.18 0.48,0.33 0.76,0.44l0.17,1.18c0.02,0.11 0.11,0.19 0.22,0.19h1.79c0.11,0 0.21,-0.08 0.22,-0.19l0.17,-1.18c0.27,-0.12 0.53,-0.26 0.75,-0.44l1.12,0.45c0.1,0.04 0.22,0 0.28,-0.1l0.9,-1.55C22.03,18.86 22,18.74 21.92,18.67zM17.63,18.83c-0.74,0 -1.35,-0.6 -1.35,-1.35s0.6,-1.35 1.35,-1.35s1.35,0.6 1.35,1.35S18.37,18.83 17.63,18.83z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml b/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml
deleted file mode 100644
index 0dd56678..00000000
--- a/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L8,16L8,4h12v12zM10,9h8v2h-8zM10,12h4v2h-4zM10,6h8v2h-8z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_multi_reddit_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_multi_reddit_day_night_24dp.xml
new file mode 100644
index 00000000..0dd56678
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_multi_reddit_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L8,16L8,4h12v12zM10,9h8v2h-8zM10,12h4v2h-4zM10,6h8v2h-8z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml b/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml
deleted file mode 100644
index ff764c78..00000000
--- a/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M4.34,2.93L2.93,4.34 7.29,8.7 7,9L3,9v6h4l5,5v-6.59l4.18,4.18c-0.65,0.49 -1.38,0.88 -2.18,1.11v2.06c1.34,-0.3 2.57,-0.92 3.61,-1.75l2.05,2.05 1.41,-1.41L4.34,2.93zM10,15.17L7.83,13L5,13v-2h2.83l0.88,-0.88L10,11.41v3.76zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM12,4l-1.88,1.88L12,7.76zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_mute_preferences_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_mute_preferences_day_night_24dp.xml
new file mode 100644
index 00000000..ff764c78
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_mute_preferences_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M4.34,2.93L2.93,4.34 7.29,8.7 7,9L3,9v6h4l5,5v-6.59l4.18,4.18c-0.65,0.49 -1.38,0.88 -2.18,1.11v2.06c1.34,-0.3 2.57,-0.92 3.61,-1.75l2.05,2.05 1.41,-1.41L4.34,2.93zM10,15.17L7.83,13L5,13v-2h2.83l0.88,-0.88L10,11.41v3.76zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM12,4l-1.88,1.88L12,7.76zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_notifications_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_notifications_day_night_24dp.xml
new file mode 100644
index 00000000..43d52df4
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_notifications_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_nsfw_off_24dp.xml b/app/src/main/res/drawable-night/ic_nsfw_off_24dp.xml
deleted file mode 100644
index 9f331000..00000000
--- a/app/src/main/res/drawable-night/ic_nsfw_off_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M13,2V10H21A8,8 0,0 0,13 2M19.32,15.89C20.37,14.54 21,12.84 21,11H6.44L5.5,9H2V11H4.22C4.22,11 6.11,15.07 6.34,15.42C5.24,16 4.5,17.17 4.5,18.5A3.5,3.5 0,0 0,8 22C9.76,22 11.22,20.7 11.46,19H13.54C13.78,20.7 15.24,22 17,22A3.5,3.5 0,0 0,20.5 18.5C20.5,17.46 20.04,16.53 19.32,15.89M8,20A1.5,1.5 0,0 1,6.5 18.5A1.5,1.5 0,0 1,8 17A1.5,1.5 0,0 1,9.5 18.5A1.5,1.5 0,0 1,8 20M17,20A1.5,1.5 0,0 1,15.5 18.5A1.5,1.5 0,0 1,17 17A1.5,1.5 0,0 1,18.5 18.5A1.5,1.5 0,0 1,17 20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_nsfw_off_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_nsfw_off_day_night_24dp.xml
new file mode 100644
index 00000000..9f331000
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_nsfw_off_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M13,2V10H21A8,8 0,0 0,13 2M19.32,15.89C20.37,14.54 21,12.84 21,11H6.44L5.5,9H2V11H4.22C4.22,11 6.11,15.07 6.34,15.42C5.24,16 4.5,17.17 4.5,18.5A3.5,3.5 0,0 0,8 22C9.76,22 11.22,20.7 11.46,19H13.54C13.78,20.7 15.24,22 17,22A3.5,3.5 0,0 0,20.5 18.5C20.5,17.46 20.04,16.53 19.32,15.89M8,20A1.5,1.5 0,0 1,6.5 18.5A1.5,1.5 0,0 1,8 17A1.5,1.5 0,0 1,9.5 18.5A1.5,1.5 0,0 1,8 20M17,20A1.5,1.5 0,0 1,15.5 18.5A1.5,1.5 0,0 1,17 17A1.5,1.5 0,0 1,18.5 18.5A1.5,1.5 0,0 1,17 20Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_nsfw_on_24dp.xml b/app/src/main/res/drawable-night/ic_nsfw_on_24dp.xml
deleted file mode 100644
index ccd0b005..00000000
--- a/app/src/main/res/drawable-night/ic_nsfw_on_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M22,10C22,5.6 18.4,2 14,2V10H22M14.2,11H22C22,12.8 21.4,14.5 20.3,15.9C21,16.5 21.4,17.4 21.5,18.3L14.2,11M20.8,22.7L22.1,21.4L2.4,1.7L1.1,3L9.1,11H7.4L6.5,9H3V11H5.2C5.2,11 7.1,15.1 7.3,15.4C6.3,15.9 5.6,16.9 5.5,18C5.2,19.9 6.6,21.7 8.5,22C10.4,22.3 12.2,20.9 12.5,19H14.6C14.7,19.4 14.8,19.8 15,20.2C15.9,21.9 18.1,22.5 19.7,21.6L20.8,22.7M10.5,18.5C10.5,19.3 9.8,20 9,20S7.5,19.3 7.5,18.5 8.2,17 9,17 10.5,17.7 10.5,18.5M18.1,20C17.2,20 16.5,19.3 16.5,18.5V18.4L18.1,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_nsfw_on_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_nsfw_on_day_night_24dp.xml
new file mode 100644
index 00000000..ccd0b005
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_nsfw_on_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M22,10C22,5.6 18.4,2 14,2V10H22M14.2,11H22C22,12.8 21.4,14.5 20.3,15.9C21,16.5 21.4,17.4 21.5,18.3L14.2,11M20.8,22.7L22.1,21.4L2.4,1.7L1.1,3L9.1,11H7.4L6.5,9H3V11H5.2C5.2,11 7.1,15.1 7.3,15.4C6.3,15.9 5.6,16.9 5.5,18C5.2,19.9 6.6,21.7 8.5,22C10.4,22.3 12.2,20.9 12.5,19H14.6C14.7,19.4 14.8,19.8 15,20.2C15.9,21.9 18.1,22.5 19.7,21.6L20.8,22.7M10.5,18.5C10.5,19.3 9.8,20 9,20S7.5,19.3 7.5,18.5 8.2,17 9,17 10.5,17.7 10.5,18.5M18.1,20C17.2,20 16.5,19.3 16.5,18.5V18.4L18.1,20Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_open_link_24dp.xml b/app/src/main/res/drawable-night/ic_open_link_24dp.xml
deleted file mode 100644
index db3c9198..00000000
--- a/app/src/main/res/drawable-night/ic_open_link_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_open_link_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_open_link_day_night_24dp.xml
new file mode 100644
index 00000000..db3c9198
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_open_link_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_access_time_24dp.xml b/app/src/main/res/drawable-night/ic_outline_access_time_24dp.xml
deleted file mode 100644
index a846b915..00000000
--- a/app/src/main/res/drawable-night/ic_outline_access_time_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7L11,7v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_add_a_photo_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_outline_add_a_photo_day_night_24dp.xml
deleted file mode 100644
index 57869fc5..00000000
--- a/app/src/main/res/drawable-night/ic_outline_add_a_photo_day_night_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M21,6h-3.17L16,4h-6v2h5.12l1.83,2L21,8v12L5,20v-9L3,11v9c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM8,14c0,2.76 2.24,5 5,5s5,-2.24 5,-5 -2.24,-5 -5,-5 -5,2.24 -5,5zM13,11c1.65,0 3,1.35 3,3s-1.35,3 -3,3 -3,-1.35 -3,-3 1.35,-3 3,-3zM5,6h3L8,4L5,4L5,1L3,1v3L0,4v2h3v3h2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_add_circle_outline_24dp.xml b/app/src/main/res/drawable-night/ic_outline_add_circle_outline_24dp.xml
deleted file mode 100644
index 8c721cf1..00000000
--- a/app/src/main/res/drawable-night/ic_outline_add_circle_outline_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,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-night/ic_outline_bookmarks_24dp.xml b/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml
deleted file mode 100644
index dc287190..00000000
--- a/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M15,7v12.97l-4.21,-1.81 -0.79,-0.34 -0.79,0.34L5,19.97L5,7h10m4,-6L8.99,1C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13l2,1L21,3c0,-1.1 -0.9,-2 -2,-2zM15,5L5,5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L17,7c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml b/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml
deleted file mode 100644
index 6fa0d26f..00000000
--- a/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.12 0.05,0.23 0.13,0.33 0.41,0.47 0.64,1.06 0.64,1.67 0,1.38 -1.12,2.5 -2.5,2.5zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5 0,-0.16 -0.08,-0.28 -0.14,-0.35 -0.41,-0.46 -0.63,-1.05 -0.63,-1.65 0,-1.38 1.12,-2.5 2.5,-2.5L16,15c2.21,0 4,-1.79 4,-4 0,-3.86 -3.59,-7 -8,-7z"/>
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M6.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M9.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M14.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M17.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml b/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml
deleted file mode 100644
index d4968533..00000000
--- a/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml b/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml
deleted file mode 100644
index 43d52df4..00000000
--- a/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml b/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml
deleted file mode 100644
index 6aeb54e1..00000000
--- a/app/src/main/res/drawable-night/ic_outline_privacy_policy_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M12,3.19l7,3.11V11c0,4.52 -2.98,8.69 -7,9.93C7.98,19.69 5,15.52 5,11V6.3L12,3.19M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1L12,1zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_select_photo_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_outline_select_photo_day_night_24dp.xml
deleted file mode 100644
index 136ace9f..00000000
--- a/app/src/main/res/drawable-night/ic_outline_select_photo_day_night_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M18,20L4,20L4,6h9L13,4L4,4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-9h-2v9zM10.21,16.83l-1.96,-2.36L5.5,18h11l-3.54,-4.71zM20,4L20,1h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0L20,6h3L23,4h-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml b/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml
deleted file mode 100644
index 694f0d45..00000000
--- a/app/src/main/res/drawable-night/ic_outline_user_agreement_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,1.85 -0.51,3.65 -1.38,5.21l-1.45,-1.45c1.29,-1.94 1.07,-4.58 -0.64,-6.29c-1.95,-1.95 -5.12,-1.95 -7.07,0c-1.95,1.95 -1.95,5.12 0,7.07c1.71,1.71 4.35,1.92 6.29,0.64l1.72,1.72c-1.19,1.42 -2.73,2.51 -4.47,3.04C7.98,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_video_24dp.xml b/app/src/main/res/drawable-night/ic_outline_video_24dp.xml
deleted file mode 100644
index b3546bb6..00000000
--- a/app/src/main/res/drawable-night/ic_outline_video_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,5h18v11z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_playback_speed_24dp.xml b/app/src/main/res/drawable-night/ic_playback_speed_24dp.xml
deleted file mode 100644
index 1e774fee..00000000
--- a/app/src/main/res/drawable-night/ic_playback_speed_24dp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20.38,8.57l-1.23,1.85a8,8 0,0 1,-0.22 7.58H5.07A8,8 0,0 1,15.58 6.85l1.85,-1.23A10,10 0,0 0,3.35 19a2,2 0,0 0,1.72 1h13.85a2,2 0,0 0,1.74 -1,10 10,0 0,0 -0.27,-10.44z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M10.59,15.41a2,2 0,0 0,2.83 0l5.66,-8.49 -8.49,5.66a2,2 0,0 0,0 2.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_playback_speed_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_playback_speed_day_night_24dp.xml
new file mode 100644
index 00000000..1e774fee
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_playback_speed_day_night_24dp.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.38,8.57l-1.23,1.85a8,8 0,0 1,-0.22 7.58H5.07A8,8 0,0 1,15.58 6.85l1.85,-1.23A10,10 0,0 0,3.35 19a2,2 0,0 0,1.72 1h13.85a2,2 0,0 0,1.74 -1,10 10,0 0,0 -0.27,-10.44z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M10.59,15.41a2,2 0,0 0,2.83 0l5.66,-8.49 -8.49,5.66a2,2 0,0 0,0 2.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_poll_24dp.xml b/app/src/main/res/drawable-night/ic_poll_24dp.xml
deleted file mode 100644
index fa199daf..00000000
--- a/app/src/main/res/drawable-night/ic_poll_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM7,10h2v7L7,17zM11,7h2v10h-2zM15,13h2v4h-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_poll_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_poll_day_night_24dp.xml
new file mode 100644
index 00000000..fa199daf
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_poll_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM7,10h2v7L7,17zM11,7h2v10h-2zM15,13h2v4h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_post_layout_24dp.xml b/app/src/main/res/drawable-night/ic_post_layout_24dp.xml
deleted file mode 100644
index c83788d8..00000000
--- a/app/src/main/res/drawable-night/ic_post_layout_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3,5v14h19L22,5L3,5zM5,7h15v4L5,11L5,7zM5,17v-4h4v4L5,17zM11,17v-4h9v4h-9z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_post_layout_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_post_layout_day_night_24dp.xml
new file mode 100644
index 00000000..c83788d8
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_post_layout_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,5v14h19L22,5L3,5zM5,7h15v4L5,11L5,7zM5,17v-4h4v4L5,17zM11,17v-4h9v4h-9z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_preview_24dp.xml b/app/src/main/res/drawable-night/ic_preview_24dp.xml
deleted file mode 100644
index e54e3a9f..00000000
--- a/app/src/main/res/drawable-night/ic_preview_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,6.5c3.79,0 7.17,2.13 8.82,5.5 -1.65,3.37 -5.02,5.5 -8.82,5.5S4.83,15.37 3.18,12C4.83,8.63 8.21,6.5 12,6.5m0,-2C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,9.5c1.38,0 2.5,1.12 2.5,2.5s-1.12,2.5 -2.5,2.5 -2.5,-1.12 -2.5,-2.5 1.12,-2.5 2.5,-2.5m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5s2.02,4.5 4.5,4.5 4.5,-2.02 4.5,-4.5 -2.02,-4.5 -4.5,-4.5z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_preview_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_preview_day_night_24dp.xml
new file mode 100644
index 00000000..e54e3a9f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_preview_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,6.5c3.79,0 7.17,2.13 8.82,5.5 -1.65,3.37 -5.02,5.5 -8.82,5.5S4.83,15.37 3.18,12C4.83,8.63 8.21,6.5 12,6.5m0,-2C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,9.5c1.38,0 2.5,1.12 2.5,2.5s-1.12,2.5 -2.5,2.5 -2.5,-1.12 -2.5,-2.5 1.12,-2.5 2.5,-2.5m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5s2.02,4.5 4.5,4.5 4.5,-2.02 4.5,-4.5 -2.02,-4.5 -4.5,-4.5z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_privacy_policy_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_privacy_policy_day_night_24dp.xml
new file mode 100644
index 00000000..6aeb54e1
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_privacy_policy_day_night_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,3.19l7,3.11V11c0,4.52 -2.98,8.69 -7,9.93C7.98,19.69 5,15.52 5,11V6.3L12,3.19M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1L12,1zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_random_24dp.xml b/app/src/main/res/drawable-night/ic_random_24dp.xml
deleted file mode 100644
index b80a99cf..00000000
--- a/app/src/main/res/drawable-night/ic_random_24dp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M7.5,16.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M7.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M12,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M16.5,16.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M16.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_random_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_random_day_night_24dp.xml
new file mode 100644
index 00000000..b80a99cf
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_random_day_night_24dp.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M7.5,16.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M7.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M16.5,16.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M16.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_refresh_24dp.xml b/app/src/main/res/drawable-night/ic_refresh_24dp.xml
deleted file mode 100644
index 768b210a..00000000
--- a/app/src/main/res/drawable-night/ic_refresh_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      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"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_refresh_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_refresh_day_night_24dp.xml
new file mode 100644
index 00000000..768b210a
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_refresh_day_night_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"
+    android:viewportHeight="24">
+  <path
+      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"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_reply_24dp.xml b/app/src/main/res/drawable-night/ic_reply_24dp.xml
deleted file mode 100644
index f8ebec5e..00000000
--- a/app/src/main/res/drawable-night/ic_reply_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_reply_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_reply_day_night_24dp.xml
new file mode 100644
index 00000000..f8ebec5e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_reply_day_night_24dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_report_24dp.xml b/app/src/main/res/drawable-night/ic_report_24dp.xml
deleted file mode 100644
index 252ebc72..00000000
--- a/app/src/main/res/drawable-night/ic_report_24dp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15.73,3H8.27L3,8.27v7.46L8.27,21h7.46L21,15.73V8.27L15.73,3zM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5h5.8L19,9.1v5.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M11,7h2v7h-2z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_report_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_report_day_night_24dp.xml
new file mode 100644
index 00000000..252ebc72
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_report_day_night_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.73,3H8.27L3,8.27v7.46L8.27,21h7.46L21,15.73V8.27L15.73,3zM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5h5.8L19,9.1v5.8z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M11,7h2v7h-2z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_round_check_circle_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_round_check_circle_day_night_24dp.xml
deleted file mode 100644
index d11c68bf..00000000
--- a/app/src/main/res/drawable-night/ic_round_check_circle_day_night_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M12,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,8zM15.88,8.29L10,14.17l-1.88,-1.88c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l2.59,2.59c0.39,0.39 1.02,0.39 1.41,0L17.3,9.7c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.03,-0.39 -1.42,0z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_save_to_database_24dp.xml b/app/src/main/res/drawable-night/ic_save_to_database_24dp.xml
deleted file mode 100644
index b10b206f..00000000
--- a/app/src/main/res/drawable-night/ic_save_to_database_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_save_to_database_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_save_to_database_day_night_24dp.xml
new file mode 100644
index 00000000..b10b206f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_save_to_database_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_search_24dp.xml b/app/src/main/res/drawable-night/ic_search_24dp.xml
deleted file mode 100644
index 466e71dd..00000000
--- a/app/src/main/res/drawable-night/ic_search_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" 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-night/ic_search_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_search_day_night_24dp.xml
new file mode 100644
index 00000000..466e71dd
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_search_day_night_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" 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-night/ic_security_24dp.xml b/app/src/main/res/drawable-night/ic_security_24dp.xml
deleted file mode 100644
index 3e21f473..00000000
--- a/app/src/main/res/drawable-night/ic_security_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_security_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_security_day_night_24dp.xml
new file mode 100644
index 00000000..3e21f473
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_security_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_select_photo_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_select_photo_day_night_24dp.xml
new file mode 100644
index 00000000..136ace9f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_select_photo_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M18,20L4,20L4,6h9L13,4L4,4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-9h-2v9zM10.21,16.83l-1.96,-2.36L5.5,18h11l-3.54,-4.71zM20,4L20,1h-2v3h-3c0.01,0.01 0,2 0,2h3v2.99c0.01,0.01 2,0 2,0L20,6h3L23,4h-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_settings_24dp.xml b/app/src/main/res/drawable-night/ic_settings_24dp.xml
deleted file mode 100644
index 364c03b7..00000000
--- a/app/src/main/res/drawable-night/ic_settings_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -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.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-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.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-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.98 0,0.33 0.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.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.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.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_settings_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_settings_day_night_24dp.xml
new file mode 100644
index 00000000..364c03b7
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_settings_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -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.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-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.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-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.98 0,0.33 0.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.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.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.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_share_24dp.xml b/app/src/main/res/drawable-night/ic_share_24dp.xml
deleted file mode 100644
index cbe3d4aa..00000000
--- a/app/src/main/res/drawable-night/ic_share_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      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.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_share_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_share_day_night_24dp.xml
new file mode 100644
index 00000000..cbe3d4aa
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_share_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_sort_24dp.xml b/app/src/main/res/drawable-night/ic_sort_24dp.xml
deleted file mode 100644
index e795d2a2..00000000
--- a/app/src/main/res/drawable-night/ic_sort_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_sort_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_sort_day_night_24dp.xml
new file mode 100644
index 00000000..e795d2a2
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_sort_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_submit_post_24dp.xml b/app/src/main/res/drawable-night/ic_submit_post_24dp.xml
deleted file mode 100644
index 21ef5658..00000000
--- a/app/src/main/res/drawable-night/ic_submit_post_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      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"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_submit_post_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_submit_post_day_night_24dp.xml
new file mode 100644
index 00000000..21ef5658
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_submit_post_day_night_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"
+    android:viewportHeight="24">
+  <path
+      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"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_subreddit_24dp.xml b/app/src/main/res/drawable-night/ic_subreddit_24dp.xml
deleted file mode 100644
index 505f8067..00000000
--- a/app/src/main/res/drawable-night/ic_subreddit_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15,4v7L5.17,11L4,12.17L4,4h11m1,-2L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1L17,3c0,-0.55 -0.45,-1 -1,-1zM21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_subreddit_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_subreddit_day_night_24dp.xml
new file mode 100644
index 00000000..505f8067
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_subreddit_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,4v7L5.17,11L4,12.17L4,4h11m1,-2L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1L17,3c0,-0.55 -0.45,-1 -1,-1zM21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_subscriptions_bottom_app_bar_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_subscriptions_bottom_app_bar_day_night_24dp.xml
new file mode 100644
index 00000000..660848ef
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_subscriptions_bottom_app_bar_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM19.47,9.16l-5.01,-0.43 -2,-4.71c3.21,0.19 5.91,2.27 7.01,5.14zM14.4,15.42L12,13.98l-2.39,1.44 0.63,-2.72 -2.11,-1.83 2.78,-0.24L12,8.06l1.09,2.56 2.78,0.24 -2.11,1.83 0.64,2.73zM11.54,4.02l-2,4.72 -5.02,0.43c1.1,-2.88 3.8,-4.97 7.02,-5.15zM4,12c0,-0.64 0.08,-1.26 0.23,-1.86l3.79,3.28 -1.11,4.75C5.13,16.7 4,14.48 4,12zM7.84,18.82L12,16.31l4.16,2.5c-1.22,0.75 -2.64,1.19 -4.17,1.19 -1.52,0 -2.94,-0.44 -4.15,-1.18zM17.09,18.17l-1.11,-4.75 3.79,-3.28c0.14,0.59 0.23,1.22 0.23,1.86 0,2.48 -1.14,4.7 -2.91,6.17z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_subscritptions_bottom_app_bar_24dp.xml b/app/src/main/res/drawable-night/ic_subscritptions_bottom_app_bar_24dp.xml
deleted file mode 100644
index 660848ef..00000000
--- a/app/src/main/res/drawable-night/ic_subscritptions_bottom_app_bar_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM19.47,9.16l-5.01,-0.43 -2,-4.71c3.21,0.19 5.91,2.27 7.01,5.14zM14.4,15.42L12,13.98l-2.39,1.44 0.63,-2.72 -2.11,-1.83 2.78,-0.24L12,8.06l1.09,2.56 2.78,0.24 -2.11,1.83 0.64,2.73zM11.54,4.02l-2,4.72 -5.02,0.43c1.1,-2.88 3.8,-4.97 7.02,-5.15zM4,12c0,-0.64 0.08,-1.26 0.23,-1.86l3.79,3.28 -1.11,4.75C5.13,16.7 4,14.48 4,12zM7.84,18.82L12,16.31l4.16,2.5c-1.22,0.75 -2.64,1.19 -4.17,1.19 -1.52,0 -2.94,-0.44 -4.15,-1.18zM17.09,18.17l-1.11,-4.75 3.79,-3.28c0.14,0.59 0.23,1.22 0.23,1.86 0,2.48 -1.14,4.7 -2.91,6.17z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_text_24dp.xml b/app/src/main/res/drawable-night/ic_text_24dp.xml
deleted file mode 100644
index a88d9084..00000000
--- a/app/src/main/res/drawable-night/ic_text_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L6,16l-2,2L4,4h16v12zM7,9h2v2L7,11zM11,9h2v2h-2zM15,9h2v2h-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_text_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_text_day_night_24dp.xml
new file mode 100644
index 00000000..a88d9084
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_text_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L6,16l-2,2L4,4h16v12zM7,9h2v2L7,11zM11,9h2v2h-2zM15,9h2v2h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_user_24dp.xml b/app/src/main/res/drawable-night/ic_user_24dp.xml
deleted file mode 100644
index 4b963261..00000000
--- a/app/src/main/res/drawable-night/ic_user_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10.25,13c0,0.69 -0.56,1.25 -1.25,1.25S7.75,13.69 7.75,13s0.56,-1.25 1.25,-1.25 1.25,0.56 1.25,1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM22,12c0,5.52 -4.48,10 -10,10S2,17.52 2,12 6.48,2 12,2s10,4.48 10,10zM10.66,4.12C12.06,6.44 14.6,8 17.5,8c0.46,0 0.91,-0.05 1.34,-0.12C17.44,5.56 14.9,4 12,4c-0.46,0 -0.91,0.05 -1.34,0.12zM4.42,9.47c1.71,-0.97 3.03,-2.55 3.66,-4.44C6.37,6 5.05,7.58 4.42,9.47zM20,12c0,-0.78 -0.12,-1.53 -0.33,-2.24 -0.7,0.15 -1.42,0.24 -2.17,0.24 -3.13,0 -5.92,-1.44 -7.76,-3.69C8.69,8.87 6.6,10.88 4,11.86c0.01,0.04 0,0.09 0,0.14 0,4.41 3.59,8 8,8s8,-3.59 8,-8z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_user_agreement_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_user_agreement_day_night_24dp.xml
new file mode 100644
index 00000000..694f0d45
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_user_agreement_day_night_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,1.85 -0.51,3.65 -1.38,5.21l-1.45,-1.45c1.29,-1.94 1.07,-4.58 -0.64,-6.29c-1.95,-1.95 -5.12,-1.95 -7.07,0c-1.95,1.95 -1.95,5.12 0,7.07c1.71,1.71 4.35,1.92 6.29,0.64l1.72,1.72c-1.19,1.42 -2.73,2.51 -4.47,3.04C7.98,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_user_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_user_day_night_24dp.xml
new file mode 100644
index 00000000..4b963261
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_user_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.25,13c0,0.69 -0.56,1.25 -1.25,1.25S7.75,13.69 7.75,13s0.56,-1.25 1.25,-1.25 1.25,0.56 1.25,1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM22,12c0,5.52 -4.48,10 -10,10S2,17.52 2,12 6.48,2 12,2s10,4.48 10,10zM10.66,4.12C12.06,6.44 14.6,8 17.5,8c0.46,0 0.91,-0.05 1.34,-0.12C17.44,5.56 14.9,4 12,4c-0.46,0 -0.91,0.05 -1.34,0.12zM4.42,9.47c1.71,-0.97 3.03,-2.55 3.66,-4.44C6.37,6 5.05,7.58 4.42,9.47zM20,12c0,-0.78 -0.12,-1.53 -0.33,-2.24 -0.7,0.15 -1.42,0.24 -2.17,0.24 -3.13,0 -5.92,-1.44 -7.76,-3.69C8.69,8.87 6.6,10.88 4,11.86c0.01,0.04 0,0.09 0,0.14 0,4.41 3.59,8 8,8s8,-3.59 8,-8z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_video_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_video_day_night_24dp.xml
new file mode 100644
index 00000000..b3546bb6
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_video_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,5h18v11z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_wallpaper_both_black_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_both_black_24dp.xml
deleted file mode 100644
index d41e02ac..00000000
--- a/app/src/main/res/drawable-night/ic_wallpaper_both_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_wallpaper_both_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_both_day_night_24dp.xml
new file mode 100644
index 00000000..d41e02ac
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_wallpaper_both_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_wallpaper_home_screen_black_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_home_screen_black_24dp.xml
deleted file mode 100644
index c112c91b..00000000
--- a/app/src/main/res/drawable-night/ic_wallpaper_home_screen_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_wallpaper_home_screen_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_home_screen_day_night_24dp.xml
new file mode 100644
index 00000000..c112c91b
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_wallpaper_home_screen_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_black_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_black_24dp.xml
deleted file mode 100644
index c771c895..00000000
--- a/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_day_night_24dp.xml
new file mode 100644
index 00000000..c771c895
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_wallpaper_lock_screen_day_night_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"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"
+      android:fillColor="#FFFFFF"/>
+</vector>
-- 
cgit v1.2.3