From c6d9dfa0c9a86d948a33f3f75a7b7a0c11546dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 26 Aug 2019 20:54:20 +0200
Subject: [PATCH] Change app theme (#330)

---
 .idea/codeStyles/Project.xml                  |  19 +-
 app/build.gradle                              |  19 +-
 app/jacoco.gradle                             |   2 +-
 app/proguard-rules.pro                        |   9 +-
 .../res/drawable/ic_launcher_foreground.xml   |  58 ---
 .../drawable/ic_launcher_foreground_dev.xml   |  34 ++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   4 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   4 +-
 .../res/values/ic_launcher_background.xml     |   4 -
 app/src/main/AndroidManifest.xml              |   1 +
 .../java/io/github/wulkanowy/WulkanowyApp.kt  |   5 +
 .../io/github/wulkanowy/di/BuilderModule.kt   |   3 +-
 .../wulkanowy/services/ServicesModule.kt      |   1 +
 .../wulkanowy/services/sync/SyncWorker.kt     |   2 +-
 .../services/sync/works/GradeWork.kt          |   8 +-
 .../services/sync/works/LuckyNumberWork.kt    |   8 +-
 .../services/sync/works/MessageWork.kt        |   8 +-
 .../wulkanowy/services/sync/works/NoteWork.kt |   8 +-
 .../github/wulkanowy/ui/base/BaseActivity.kt  |  11 +-
 .../github/wulkanowy/ui/base/ThemeManager.kt  |  24 +-
 .../ui/modules/about/AboutFragment.kt         | 128 ++++---
 .../wulkanowy/ui/modules/about/AboutItem.kt   |  56 +++
 .../wulkanowy/ui/modules/about/AboutModule.kt |  14 -
 .../ui/modules/about/AboutPresenter.kt        |  58 ++-
 .../ui/modules/about/AboutScrollableHeader.kt |  41 +++
 .../wulkanowy/ui/modules/about/AboutView.kt   |  27 +-
 .../modules/about/license/LicenseFragment.kt  |  87 +++++
 .../ui/modules/about/license/LicenseItem.kt   |  44 +++
 .../ui/modules/about/license/LicenseModule.kt |  15 +
 .../modules/about/license/LicensePresenter.kt |  40 +++
 .../ui/modules/about/license/LicenseView.kt   |  17 +
 .../modules/attendance/AttendanceFragment.kt  |   4 +-
 .../ui/modules/grade/GradeFragment.kt         |   1 +
 .../wulkanowy/ui/modules/grade/GradeModule.kt |   1 +
 .../statistics/GradeStatisticsFragment.kt     |   4 +-
 .../wulkanowy/ui/modules/login/LoginModule.kt |   1 +
 .../modules/login/form/LoginFormFragment.kt   |  23 +-
 .../modules/login/form/LoginFormPresenter.kt  |   2 +-
 .../ui/modules/login/form/LoginFormView.kt    |   2 +-
 .../studentselect/LoginStudentSelectItem.kt   |   2 +-
 .../LuckyNumberWidgetProvider.kt              |   6 +-
 .../wulkanowy/ui/modules/main/MainActivity.kt |  85 +++--
 .../wulkanowy/ui/modules/main/MainModule.kt   |  18 +-
 .../ui/modules/main/MainPresenter.kt          |  15 +-
 .../wulkanowy/ui/modules/main/MainView.kt     |  17 +-
 .../ui/modules/message/MessageModule.kt       |   1 +
 .../ui/modules/message/send/RecipientChip.kt  |  30 --
 .../modules/message/send/RecipientChipItem.kt |  14 +
 .../message/send/SendMessageActivity.kt       |  70 +++-
 .../message/send/SendMessagePresenter.kt      |  83 +++--
 .../modules/message/send/SendMessageView.kt   |  15 +-
 .../wulkanowy/ui/modules/more/MoreFragment.kt |  56 +--
 .../ui/modules/more/MorePresenter.kt          |  25 +-
 .../wulkanowy/ui/modules/more/MoreView.kt     |   2 +-
 .../ui/modules/settings/SettingsFragment.kt   |  14 +-
 .../ui/modules/settings/SettingsPresenter.kt  |   4 +-
 .../modules/timetable/TimetablePresenter.kt   |   2 +-
 .../completed/CompletedLessonsFragment.kt     |   4 +-
 .../TimetableWidgetProvider.kt                |   6 +-
 .../ui/widgets/MaterialLinearLayout.kt        |  31 ++
 .../wulkanowy/utils/ContextExtension.kt       |   6 +
 .../utils/FragNavControlerExtension.kt        |  11 +-
 .../wulkanowy/utils/FragmentExtension.kt      |  32 ++
 .../wulkanowy/utils/LibsBuiderExtension.kt    |  16 -
 .../res/drawable-anydpi-v24/ic_stat_grade.xml |  13 +
 .../ic_stat_luckynumber.xml                   |  13 +
 .../drawable-anydpi-v24/ic_stat_message.xml   |  13 +
 .../res/drawable-anydpi-v24/ic_stat_note.xml  |  13 +
 .../ic_stat_notify_lucky_number.xml           |  14 -
 .../main/res/drawable-hdpi/ic_stat_grade.png  | Bin 0 -> 364 bytes
 ...cky_number.png => ic_stat_luckynumber.png} | Bin
 .../res/drawable-hdpi/ic_stat_message.png     | Bin 0 -> 252 bytes
 .../main/res/drawable-hdpi/ic_stat_note.png   | Bin 0 -> 347 bytes
 .../drawable-hdpi/ic_stat_notify_grade.png    | Bin 393 -> 0 bytes
 .../drawable-hdpi/ic_stat_notify_message.png  | Bin 271 -> 0 bytes
 .../res/drawable-hdpi/ic_stat_notify_note.png | Bin 414 -> 0 bytes
 .../main/res/drawable-mdpi/ic_stat_grade.png  | Bin 0 -> 301 bytes
 ...cky_number.png => ic_stat_luckynumber.png} | Bin
 .../res/drawable-mdpi/ic_stat_message.png     | Bin 0 -> 220 bytes
 .../main/res/drawable-mdpi/ic_stat_note.png   | Bin 0 -> 280 bytes
 .../drawable-mdpi/ic_stat_notify_grade.png    | Bin 299 -> 0 bytes
 .../drawable-mdpi/ic_stat_notify_message.png  | Bin 214 -> 0 bytes
 .../res/drawable-mdpi/ic_stat_notify_note.png | Bin 302 -> 0 bytes
 .../ic_account_circular_border.xml            |   8 +
 .../res/drawable-night/ic_all_divider.xml     |   2 +-
 .../drawable-v23/layer_splash_background.xml  |   6 +-
 .../main/res/drawable-xhdpi/ic_stat_grade.png | Bin 0 -> 427 bytes
 ...cky_number.png => ic_stat_luckynumber.png} | Bin
 .../res/drawable-xhdpi/ic_stat_message.png    | Bin 0 -> 289 bytes
 .../main/res/drawable-xhdpi/ic_stat_note.png  | Bin 0 -> 449 bytes
 .../drawable-xhdpi/ic_stat_notify_grade.png   | Bin 469 -> 0 bytes
 .../drawable-xhdpi/ic_stat_notify_message.png | Bin 268 -> 0 bytes
 .../drawable-xhdpi/ic_stat_notify_note.png    | Bin 554 -> 0 bytes
 .../res/drawable-xxhdpi/ic_stat_grade.png     | Bin 0 -> 602 bytes
 ...cky_number.png => ic_stat_luckynumber.png} | Bin
 .../res/drawable-xxhdpi/ic_stat_message.png   | Bin 0 -> 361 bytes
 .../main/res/drawable-xxhdpi/ic_stat_note.png | Bin 0 -> 590 bytes
 .../drawable-xxhdpi/ic_stat_notify_grade.png  | Bin 624 -> 0 bytes
 .../ic_stat_notify_message.png                | Bin 401 -> 0 bytes
 .../drawable-xxhdpi/ic_stat_notify_note.png   | Bin 801 -> 0 bytes
 .../ic_stat_notify_message.png                | Bin 458 -> 0 bytes
 .../drawable-xxxhdpi/ic_stat_notify_note.png  | Bin 1238 -> 0 bytes
 ....xml => backgorund_luckynumber_widget.xml} |   2 +-
 .../main/res/drawable/ic_about_discord.xml    |   9 +
 .../main/res/drawable/ic_about_feedback.xml   |   9 +
 .../main/res/drawable/ic_about_homepage.xml   |   9 +
 .../main/res/drawable/ic_about_licenses.xml   |   9 +
 .../main/res/drawable/ic_about_privacy.xml    |   9 +
 ...ic_all_about_24dp.xml => ic_all_about.xml} |   8 +-
 app/src/main/res/drawable/ic_all_account.xml  |   9 +
 .../main/res/drawable/ic_all_account_24dp.xml |  11 -
 app/src/main/res/drawable/ic_all_add.xml      |   9 +
 app/src/main/res/drawable/ic_all_add_24dp.xml |   5 -
 ...ircle_24dp.xml => ic_all_close_circle.xml} |   4 +-
 app/src/main/res/drawable/ic_all_divider.xml  |   2 +-
 .../{ic_all_note_24dp.xml => ic_all_mark.xml} |   7 +-
 ...nd_note_24dp.xml => ic_all_round_mark.xml} |   9 +-
 .../res/drawable/ic_launcher_foreground.xml   |  38 +-
 .../res/drawable/ic_login_outlined_border.xml |  12 -
 .../main/res/drawable/ic_main_attendance.xml  |   9 +
 app/src/main/res/drawable/ic_main_exam.xml    |   9 +
 app/src/main/res/drawable/ic_main_grade.xml   |   9 +
 ...nu_main_more_24dp.xml => ic_main_more.xml} |   2 +-
 ...metable_24dp.xml => ic_main_timetable.xml} |   5 +-
 .../drawable/ic_menu_attendance_summary.xml   |   9 +
 ...er_24dp.xml => ic_menu_grade_semester.xml} |   2 +-
 .../drawable/ic_menu_main_attendance_24dp.xml |  11 -
 .../ic_menu_main_attendance_summary_24dp.xml  |   5 -
 .../res/drawable/ic_menu_main_exam_24dp.xml   |  10 -
 .../res/drawable/ic_menu_main_grade_26dp.xml  |  11 -
 .../drawable/ic_menu_main_homework_24dp.xml   |  12 -
 .../res/drawable/ic_menu_main_note_24dp.xml   |  13 -
 ...te_24dp.xml => ic_menu_message_delete.xml} |   2 +-
 ...d_24dp.xml => ic_menu_message_forward.xml} |   3 +-
 ...ply_24dp.xml => ic_menu_message_reply.xml} |   3 +-
 ...sage_24dp.xml => ic_menu_message_send.xml} |   3 +-
 ...age_24dp.xml => ic_menu_message_write.xml} |   4 +-
 ...> ic_menu_timetable_lessons_completed.xml} |   2 +-
 .../main/res/drawable/ic_more_homework.xml    |   9 +
 .../res/drawable/ic_more_lucky_number.xml     |   9 +
 .../drawable/ic_more_lucky_number_24dp.xml    |   9 -
 ...messages_24dp.xml => ic_more_messages.xml} |   2 +-
 ...es_24dp.xml => ic_more_mobile_devices.xml} |  12 +-
 app/src/main/res/drawable/ic_more_note.xml    |   9 +
 .../main/res/drawable/ic_more_settings.xml    |   9 +
 .../res/drawable/ic_more_settings_24dp.xml    |  17 -
 ...le_swap_30dp.xml => ic_timetable_swap.xml} |   2 +-
 ...chevron_24dp.png => ic_widget_chevron.png} | Bin
 ...t_clover_24dp.png => ic_widget_clover.png} | Bin
 .../res/drawable/layer_splash_background.xml  |   2 +-
 app/src/main/res/layout/activity_main.xml     |  20 +-
 .../main/res/layout/activity_send_message.xml | 335 ++++++++++--------
 .../res/layout/activity_widget_configure.xml  |   3 +-
 app/src/main/res/layout/dialog_account.xml    |  16 +-
 app/src/main/res/layout/dialog_attendance.xml |  12 +-
 app/src/main/res/layout/dialog_error.xml      |  28 +-
 app/src/main/res/layout/dialog_exam.xml       |  13 +-
 app/src/main/res/layout/dialog_grade.xml      |  17 +-
 app/src/main/res/layout/dialog_homework.xml   |  12 +-
 .../res/layout/dialog_lesson_completed.xml    |  29 +-
 .../main/res/layout/dialog_mobile_device.xml  |  20 +-
 app/src/main/res/layout/dialog_note.xml       |  12 +-
 app/src/main/res/layout/dialog_timetable.xml  |  23 +-
 app/src/main/res/layout/fragment_about.xml    |  10 +
 .../main/res/layout/fragment_attendance.xml   |  48 +--
 .../layout/fragment_attendance_summary.xml    |  33 +-
 app/src/main/res/layout/fragment_exam.xml     |  49 +--
 app/src/main/res/layout/fragment_grade.xml    |  25 +-
 .../res/layout/fragment_grade_details.xml     |  18 +-
 .../res/layout/fragment_grade_statistics.xml  |  41 ++-
 .../res/layout/fragment_grade_summary.xml     |  18 +-
 app/src/main/res/layout/fragment_homework.xml |  49 +--
 app/src/main/res/layout/fragment_license.xml  |  18 +
 .../main/res/layout/fragment_login_form.xml   |  54 +--
 .../layout/fragment_login_student_select.xml  |   7 +-
 .../main/res/layout/fragment_login_symbol.xml |  10 +-
 .../main/res/layout/fragment_lucky_number.xml |  23 +-
 app/src/main/res/layout/fragment_message.xml  |  20 +-
 .../res/layout/fragment_message_preview.xml   |  22 +-
 .../main/res/layout/fragment_message_tab.xml  |  18 +-
 .../res/layout/fragment_mobile_device.xml     |  14 +-
 app/src/main/res/layout/fragment_note.xml     |  18 +-
 .../main/res/layout/fragment_timetable.xml    |  49 +--
 .../layout/fragment_timetable_completed.xml   |  38 +-
 app/src/main/res/layout/header_exam.xml       |   9 +-
 .../main/res/layout/header_grade_details.xml  |  19 +-
 app/src/main/res/layout/header_homework.xml   |   5 +-
 app/src/main/res/layout/item_about.xml        |  51 +++
 app/src/main/res/layout/item_account.xml      |  16 +-
 app/src/main/res/layout/item_attendance.xml   |  19 +-
 .../res/layout/item_attendance_summary.xml    |  12 +-
 .../item_attendance_summary_subject.xml       |   3 +-
 .../main/res/layout/item_completed_lesson.xml |  14 +-
 app/src/main/res/layout/item_exam.xml         |  14 +-
 .../main/res/layout/item_grade_details.xml    |  19 +-
 .../main/res/layout/item_grade_summary.xml    |   6 +-
 app/src/main/res/layout/item_homework.xml     |  14 +-
 app/src/main/res/layout/item_license.xml      |  29 ++
 .../res/layout/item_login_student_select.xml  |  13 +-
 app/src/main/res/layout/item_message.xml      |   7 +-
 .../main/res/layout/item_mobile_device.xml    |   4 +-
 app/src/main/res/layout/item_more.xml         |  15 +-
 app/src/main/res/layout/item_note.xml         |  18 +-
 app/src/main/res/layout/item_timetable.xml    |  23 +-
 .../main/res/layout/item_widget_timetable.xml |   2 +-
 .../res/layout/scrollable_header_about.xml    |  33 ++
 .../scrollable_header_attendance_summary.xml  |   5 +-
 .../scrollable_header_grade_summary.xml       |  11 +-
 .../main/res/layout/widget_luckynumber.xml    |   6 +-
 app/src/main/res/layout/widget_timetable.xml  |   4 +-
 .../main/res/menu/action_menu_attendance.xml  |   3 +-
 app/src/main/res/menu/action_menu_grade.xml   |   3 +-
 .../res/menu/action_menu_grade_details.xml    |   1 +
 app/src/main/res/menu/action_menu_main.xml    |   3 +-
 .../res/menu/action_menu_message_preview.xml  |   9 +-
 .../res/menu/action_menu_send_message.xml     |   3 +-
 .../main/res/menu/action_menu_timetable.xml   |   3 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   4 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   4 +-
 app/src/main/res/values-night/colors.xml      |   4 -
 app/src/main/res/values-night/styles.xml      |  39 +-
 app/src/main/res/values-pl/strings.xml        |  15 +-
 app/src/main/res/values-v23/styles.xml        |  14 +
 app/src/main/res/values-v27/styles.xml        |  17 +
 app/src/main/res/values/attrs.xml             |   3 +-
 app/src/main/res/values/colors.xml            |  16 +-
 .../res/values/ic_launcher_background.xml     |   4 -
 app/src/main/res/values/strings.xml           |  15 +-
 app/src/main/res/values/styles.xml            |  51 +--
 app/src/main/res/xml/scheme_preferences.xml   | 203 ++++++-----
 .../modules/message/send/TestRecipientChip.kt |  20 --
 231 files changed, 2225 insertions(+), 1511 deletions(-)
 delete mode 100644 app/src/debug/res/drawable/ic_launcher_foreground.xml
 create mode 100644 app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
 delete mode 100644 app/src/debug/res/values/ic_launcher_background.xml
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
 create mode 100644 app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
 delete mode 100644 app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
 create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_grade.png
 rename app/src/main/res/drawable-hdpi/{ic_stat_notify_lucky_number.png => ic_stat_luckynumber.png} (100%)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_message.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_note.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_notify_message.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_notify_note.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_grade.png
 rename app/src/main/res/drawable-mdpi/{ic_stat_notify_lucky_number.png => ic_stat_luckynumber.png} (100%)
 create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_message.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_note.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_notify_message.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_notify_note.png
 create mode 100644 app/src/main/res/drawable-night/ic_account_circular_border.xml
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_grade.png
 rename app/src/main/res/drawable-xhdpi/{ic_stat_notify_lucky_number.png => ic_stat_luckynumber.png} (100%)
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_message.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_note.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_grade.png
 rename app/src/main/res/drawable-xxhdpi/{ic_stat_notify_lucky_number.png => ic_stat_luckynumber.png} (100%)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_message.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_note.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png
 rename app/src/main/res/drawable/{background_rounded_corner.xml => backgorund_luckynumber_widget.xml} (81%)
 create mode 100644 app/src/main/res/drawable/ic_about_discord.xml
 create mode 100644 app/src/main/res/drawable/ic_about_feedback.xml
 create mode 100644 app/src/main/res/drawable/ic_about_homepage.xml
 create mode 100644 app/src/main/res/drawable/ic_about_licenses.xml
 create mode 100644 app/src/main/res/drawable/ic_about_privacy.xml
 rename app/src/main/res/drawable/{ic_all_about_24dp.xml => ic_all_about.xml} (69%)
 create mode 100644 app/src/main/res/drawable/ic_all_account.xml
 delete mode 100644 app/src/main/res/drawable/ic_all_account_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_all_add.xml
 delete mode 100644 app/src/main/res/drawable/ic_all_add_24dp.xml
 rename app/src/main/res/drawable/{ic_all_close_circle_24dp.xml => ic_all_close_circle.xml} (69%)
 rename app/src/main/res/drawable/{ic_all_note_24dp.xml => ic_all_mark.xml} (63%)
 rename app/src/main/res/drawable/{ic_all_round_note_24dp.xml => ic_all_round_mark.xml} (51%)
 delete mode 100644 app/src/main/res/drawable/ic_login_outlined_border.xml
 create mode 100644 app/src/main/res/drawable/ic_main_attendance.xml
 create mode 100644 app/src/main/res/drawable/ic_main_exam.xml
 create mode 100644 app/src/main/res/drawable/ic_main_grade.xml
 rename app/src/main/res/drawable/{ic_menu_main_more_24dp.xml => ic_main_more.xml} (89%)
 rename app/src/main/res/drawable/{ic_menu_main_timetable_24dp.xml => ic_main_timetable.xml} (65%)
 create mode 100644 app/src/main/res/drawable/ic_menu_attendance_summary.xml
 rename app/src/main/res/drawable/{ic_menu_grade_semester_24dp.xml => ic_menu_grade_semester.xml} (91%)
 delete mode 100644 app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_main_exam_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_main_grade_26dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_main_homework_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_main_note_24dp.xml
 rename app/src/main/res/drawable/{ic_message_delete_24dp.xml => ic_menu_message_delete.xml} (90%)
 rename app/src/main/res/drawable/{ic_message_forward_24dp.xml => ic_menu_message_forward.xml} (80%)
 rename app/src/main/res/drawable/{ic_message_reply_24dp.xml => ic_menu_message_reply.xml} (82%)
 rename app/src/main/res/drawable/{ic_menu_send_message_24dp.xml => ic_menu_message_send.xml} (80%)
 rename app/src/main/res/drawable/{ic_send_message_24dp.xml => ic_menu_message_write.xml} (63%)
 rename app/src/main/res/drawable/{ic_menu_main_lessons_completed_24dp.xml => ic_menu_timetable_lessons_completed.xml} (91%)
 create mode 100644 app/src/main/res/drawable/ic_more_homework.xml
 create mode 100644 app/src/main/res/drawable/ic_more_lucky_number.xml
 delete mode 100644 app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
 rename app/src/main/res/drawable/{ic_more_messages_24dp.xml => ic_more_messages.xml} (90%)
 rename app/src/main/res/drawable/{ic_menu_main_mobile_devices_24dp.xml => ic_more_mobile_devices.xml} (59%)
 create mode 100644 app/src/main/res/drawable/ic_more_note.xml
 create mode 100644 app/src/main/res/drawable/ic_more_settings.xml
 delete mode 100644 app/src/main/res/drawable/ic_more_settings_24dp.xml
 rename app/src/main/res/drawable/{ic_timetable_swap_30dp.xml => ic_timetable_swap.xml} (85%)
 rename app/src/main/res/drawable/{ic_widget_chevron_24dp.png => ic_widget_chevron.png} (100%)
 rename app/src/main/res/drawable/{ic_widget_clover_24dp.png => ic_widget_clover.png} (100%)
 create mode 100644 app/src/main/res/layout/fragment_about.xml
 create mode 100644 app/src/main/res/layout/fragment_license.xml
 create mode 100644 app/src/main/res/layout/item_about.xml
 create mode 100644 app/src/main/res/layout/item_license.xml
 create mode 100644 app/src/main/res/layout/scrollable_header_about.xml
 delete mode 100644 app/src/main/res/values-night/colors.xml
 create mode 100644 app/src/main/res/values-v23/styles.xml
 create mode 100644 app/src/main/res/values-v27/styles.xml
 delete mode 100644 app/src/main/res/values/ic_launcher_background.xml
 delete mode 100644 app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index dcdde40fd..d66c3361f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
@@ -24,13 +21,7 @@
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -41,6 +32,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -51,6 +43,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -62,6 +55,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -72,6 +66,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -82,6 +77,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -92,6 +88,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -102,6 +99,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -113,6 +111,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -124,6 +123,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -141,7 +141,6 @@
       <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
       <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/app/build.gradle b/app/build.gradle
index a2f2aa4ef..b45da268b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,6 +65,7 @@ android {
     }
 
     flavorDimensions "platform"
+
     productFlavors {
         play {
             dimension "platform"
@@ -84,6 +85,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    packagingOptions {
+        exclude 'META-INF/library_release.kotlin_module'
+        exclude 'META-INF/library-core_release.kotlin_module'
+    }
 }
 
 androidExtensions {
@@ -106,6 +112,11 @@ ext {
     mockito_core = "3.0.6"
 }
 
+configurations.all {
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
+    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
+}
+
 dependencies {
     implementation "io.github.wulkanowy:api:0.9.4"
 
@@ -116,14 +127,16 @@ dependencies {
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
+    implementation "androidx.preference:preference:1.1.0-rc01"
     implementation "androidx.recyclerview:recyclerview:1.0.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.0.0"
     implementation "com.google.android.material:material:1.1.0-alpha07"
-    implementation "com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
+    implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
     implementation "androidx.work:work-runtime:$work_manager"
     implementation "androidx.work:work-rxjava2:$work_manager"
@@ -152,9 +165,7 @@ dependencies {
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation "com.squareup.okhttp3:logging-interceptor:3.12.3"
-
-    implementation "com.mikepenz:aboutlibraries:6.2.3"
-    implementation "com.takisoft.preferencex:preferencex:1.0.0"
+    implementation "com.mikepenz:aboutlibraries:7.0.2"
 
     playImplementation "com.google.firebase:firebase-core:17.1.0"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 44cd3f621..48a8fed96 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.3"
+    toolVersion "0.8.4"
     reportsDir = file("$buildDir/reports")
 }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7d42536d1..a2d6346ef 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -11,6 +11,10 @@
 -verbose
 
 
+#Keep all wulkanowy files
+-keep class io.github.wulkanowy.** {*;}
+
+
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
@@ -32,11 +36,10 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
+
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }
 
-#Config for API
--keep class io.github.wulkanowy.api.** {*;}
 
 #Config for Material Components
--keep class com.google.android.material.tabs.** {*;}
+-keep class com.google.android.material.tabs.**
\ No newline at end of file
diff --git a/app/src/debug/res/drawable/ic_launcher_foreground.xml b/app/src/debug/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 6be799094..000000000
--- a/app/src/debug/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="1926.9231"
-        android:viewportHeight="1926.9231">
-    <group android:translateX="462.46155"
-            android:translateY="462.46155">
-      <path
-          android:pathData="M2000,1440.1V2002H1240.1L238.1,1000v0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8 1.6,-3.1 3.4,-6 5,-9.1 0.4,-0.8 0.6,-1.6 0.6,-2.5 9.2,-15.1 20.2,-28.9 31.4,-42.6 0.1,-0.2 0.3,-0.3 0.4,-0.5 5.1,-6.3 10.3,-12.6 15.3,-18.9 1,-1.2 1.9,-2.4 2.9,-3.7 0.2,-0.2 0.3,-0.4 0.5,-0.6 7.6,-9.7 14.8,-19.7 21.2,-30.2 1,-1.7 2,-3.4 2.9,-5.1 0.1,-0.2 0.2,-0.3 0.3,-0.5 6.2,-11.4 11.3,-23.3 17.7,-34.6 4.5,-8 9.3,-15.9 13.8,-23.9 0.1,-0.2 0.2,-0.3 0.3,-0.5 0.8,-1.5 1.6,-3 2.4,-4.4 0.2,-0.3 0.3,-0.6 0.5,-0.9 2,-3.7 3.8,-7.4 5.6,-11.2 6.2,-13.4 10.2,-27.7 14,-41.9 0,-0.2 0.1,-0.3 0.1,-0.5 0.3,-1 0.5,-2 0.8,-2.9 4,-15.3 7.3,-31.4 13.5,-45.9 1.4,-3.3 3,-6.5 4.6,-9.6 0.1,-0.2 0.2,-0.3 0.3,-0.5 5,-9.7 10.6,-19.1 13.5,-29.7 2.6,-9.2 3.5,-19 3.6,-28.8 0,-0.2 0,-0.3 0,-0.5 0.1,-7.2 -0.1,-14.4 -0.4,-21.3 0.9,-5.6 1.9,-11.3 3,-16.9 0.2,-0.9 0.3,-1.7 0.5,-2.6 1.2,-5.9 2.5,-11.7 4.2,-17.4 0,-0.1 0.1,-0.3 0.1,-0.4 0,-0.2 0.1,-0.3 0.1,-0.5 0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9 12.8,-3.9 24.9,-9.9 36.3,-16.8 2.8,-1.7 5.6,-3.4 8.3,-5.2 0.2,-0.1 0.3,-0.2 0.5,-0.3 7.7,-4.9 15.2,-10.2 22.1,-16 3.1,-2.7 5.9,-5.6 8.3,-8.9 0.1,-0.2 0.2,-0.3 0.4,-0.5 2.3,-3.4 4.2,-7.2 5.3,-11.4 2.4,-9.2 1.9,-19 1.9,-28.4 0,-0.2 0,-0.4 0,-0.6l5.7,-5.6 -0.3,0.1 4.1,1.3 45.3,45 9.6,9.6 14.3,14.3 100.8,100.8 17.2,17.2 16.3,16.3 30.3,-30.3 -192.9,-191.5c0.5,-0.5 1.1,-1.6 1.4,-2.3 0.3,-0.6 0.5,-1.2 0.4,-1.9 0,-0.8 -0.2,-1.6 -0.6,-2.3 -0.1,-0.3 -0.3,-0.7 -0.4,-1 -0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8 191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7 4.1,0 8.2,0.1 11.9,1.9 0.5,0.3 1.3,0.7 2.1,1.1 1.7,2.3 3.5,4.5 5.7,6.2 2.7,2.1 8.2,3 9.4,0.3z"
-          android:fillColor="#AD2A2A"/>
-      <path
-          android:pathData="m616.3,796.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3h-187.2c-4,0 -7.7,-2.3 -9.5,-5.6l-30.9,-57.4c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2 37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m386.7,253.5c0,-22.9 14.5,-42.6 35.3,-51.8 -1.5,-2.5 -2.4,-5.2 -2.4,-8.1 0,-11.1 12.8,-20.1 28.5,-20.1 0.4,0 0.7,0 1.1,0 6.5,-10.8 18.9,-18.1 33.1,-18.1 1,0 2,0 3,0.1 1.3,0.1 2.6,-0.5 3.3,-1.5 10.5,-16 37.1,-27.4 68.2,-27.4 11.5,0 22.4,1.6 32.1,4.3 2.3,-3.8 7.4,-6.4 13.3,-6.4 6.7,0 12.4,3.4 14.1,8.1 8.2,-9.5 22.1,-15.7 37.9,-15.7 25.2,0 45.6,15.9 45.6,35.5 0,2.4 -0.3,4.7 -0.9,7 -0.4,1.6 0.5,3.2 2.2,3.8 16.1,5.9 27,17.1 27,29.9 0,14.6 -14.1,27.1 -34,32 -1.6,0.4 -2.6,1.8 -2.6,3.3 0,0.1 0,0.2 0,0.3 0,11.3 -11.2,20.6 -25.6,21.6 0.1,0.5 0.1,1 0.1,1.6 0,21.7 -41.3,39.2 -92.2,39.2 -11,0 -21.5,-0.8 -31.2,-2.3 0,0.2 0,0.3 0,0.5 0,9 -11.6,16.3 -25.8,16.3 -0.8,0 -1.5,0 -2.2,-0.1 1,2.2 1.5,4.5 1.5,6.9 0,14 -17.7,25.3 -39.6,25.3 -2.4,0 -4.7,-0.1 -7,-0.4 -1.8,-0.2 -3.5,0.9 -3.9,2.6 -1.9,7 -8,12.1 -15.3,12.1 -8.8,0 -15.8,-7.5 -15.8,-16.7 0,-4.3 1.5,-8.2 4,-11.1 0.9,-1 1.2,-2.4 0.6,-3.6 -1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3 -27.1,-6 -47.5,-28.6 -47.5,-55.6z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m870.4,883h-124.4c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5l-41.5,-121.2c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7l-101.6,-51.3c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5l98.9,201.2c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6c5.8,6.4 0.9,16.5 -8.1,16.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m335.8,838.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1h-180.6c-8.4,0 -13.5,-8.8 -9,-15.4l116.3,-171.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4l-39.1,87.8c-0.9,2.1 -1.1,4.4 -0.4,6.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m424.22,657.05 l1580.54,-0.05c0.54,0 0,292 0,292l-1580.54,-0.03c-10.78,0 -19.46,-8.68 -19.46,-19.46l0,-252.99c0,-10.78 8.68,-19.46 19.46,-19.46z"
-          android:strokeAlpha="0.49803922"
-          android:strokeLineJoin="round"
-          android:strokeWidth="4"
-          android:fillColor="#3f3f3f"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"
-          android:fillAlpha="1"
-          android:strokeLineCap="square"/>
-      <path
-          android:pathData="m728.71,710.91l0,19.89l-88.7,0l0,59.3l77.04,0L717.05,810l-77.04,0l0,65.39l89.84,0l0,19.9L616.56,895.29L616.56,791.16l-52.35,-52.35 -0.77,-0.18c5.41,6.64 9.65,14.32 12.69,23.09 3.72,10.39 5.62,21.92 5.7,34.6L581.84,809.87c-0.08,12.67 -1.98,24.25 -5.7,34.72 -3.63,10.39 -8.95,19.35 -15.97,26.87 -6.93,7.43 -15.46,13.26 -25.6,17.49 -7.54,3.1 -15.86,5.07 -24.97,5.89 -3.04,0.27 -6.16,0.42 -9.37,0.45L457.53,895.29l0,-6.55l-0.37,6.82 53.8,53.45l415.85,0c0.24,0 0.47,-0.02 0.69,-0.05L1132.91,948.97L953.5,769.55l-58.39,-58.39 -0.28,0.06 -58.03,184.06l-20.4,0l-44.66,-141.34zM783.29,711.07 L826.41,857.52 850.08,777.86zM509.6,711.29c1.52,0.15 3.01,0.33 4.49,0.54 -1.47,-0.21 -2.97,-0.39 -4.49,-0.54zM481.35,730.04l0,146.11l18.88,0c9.97,-0.08 18.59,-1.81 25.85,-5.19 7.27,-3.46 13.26,-8.15 17.99,-14.07 4.82,-5.91 8.36,-12.88 10.64,-20.91 2.37,-8.03 3.59,-16.73 3.68,-26.11l0,-13.81c-0.08,-9.38 -1.31,-18.04 -3.68,-25.98 -2.37,-8.03 -5.91,-14.95 -10.64,-20.78 -4.73,-5.91 -10.73,-10.56 -17.99,-13.94 -7.27,-3.38 -15.88,-5.15 -25.85,-5.32zM560.17,734.86c0.65,0.69 1.26,1.4 1.88,2.11 -0.61,-0.72 -1.23,-1.42 -1.88,-2.11z"
-          android:strokeAlpha="1"
-          android:strokeLineJoin="miter"
-          android:strokeWidth="1.94642854"
-          android:fillColor="#000000"
-          android:strokeColor="#00000000"
-          android:fillAlpha="0.18431373"
-          android:strokeLineCap="butt"/>
-      <path
-          android:pathData="m457.53,895.28l0,-184.51l42.7,0q19.26,0.25 34.34,6.59 15.21,6.21 25.6,17.49 10.52,11.15 15.97,26.86 5.58,15.59 5.7,34.59l0,13.56q-0.13,19.01 -5.7,34.72 -5.45,15.59 -15.97,26.86 -10.39,11.15 -25.6,17.49 -15.08,6.21 -34.34,6.34zM481.35,730.04l0,146.11l18.88,0q14.95,-0.13 25.85,-5.2 10.9,-5.2 17.99,-14.07 7.22,-8.87 10.64,-20.91 3.55,-12.04 3.67,-26.1l0,-13.81q-0.13,-14.07 -3.67,-25.98 -3.55,-12.04 -10.64,-20.78 -7.1,-8.87 -17.99,-13.94 -10.9,-5.07 -25.85,-5.32z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="M717.05,810L640.01,810l0,65.39l89.84,0l0,19.9l-113.29,0l0,-184.51l112.15,0l0,20.02L640.01,730.8l0,59.31l77.05,0z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="m826.41,857.52 l43.59,-146.74l24.96,0l-58.16,184.51L816.4,895.28l-58.29,-184.51l25.09,0z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-    </group>
-</vector>
diff --git a/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml b/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
new file mode 100644
index 000000000..799ea0374
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_launcher_foreground_dev.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#ad2a2a"
+        android:pathData="M2465,1904v561h-759L704,1463l-120,-120 -1,-1 5,-9 1,-3c9,-15 20,-29 31,-43l16,-19 3,-4 21,-30 3,-6c7,-11 12,-23 18,-35l14,-24 3,-4v-1a234,234 0,0 0,20 -53v-1l1,-3c4,-15 7,-31 13,-46l5,-9v-1c5,-10 11,-19 14, -30 2,-9 3,-19 3,-28v-1,-21l3,-17v-3l4,-17h1v-1c0,-2 -1,-4 -3,-4l8,-8 4,1c13,-4 25,-10 37,-17l8,-5 22,-16 9,-9v-1l5, -11c3,-9 2,-19 2,-29l6,-6 4,2 45,45 10,9 14,14 101,101 17,17 16,17 31,-31 -193,-191 1,-2 1,-2 -1,-3v-1l-1,-1 27,-27 192,-192 2,1a27,27 0,0 1,14 3l6,6c2,2 8,3 9,1l1310,1310z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
+    <path
+        android:fillColor="#3f3f3f"
+        android:pathData="M886.7,1119.5h1580.5c0.6,0 0,292 0,292H886.7a19.4,19.4 0,0 1,-19.5 -19.5v-253c0,-10.8 8.7,-19.5 19.5,-19.5z"
+        android:strokeWidth="4"
+        android:strokeAlpha=".5"
+        android:strokeColor="#000"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha=".2"
+        android:fillColor="#000"
+        android:pathData="M1191.2,1173.4v19.9h-88.7v59.3h77v19.9h-77v65.4h89.8v19.9L1079,1357.8v-104.2l-52.3,-52.3 -0.8, -0.2a75.1,75.1 0,0 1,12.7 23,104 104,0 0,1 5.7,34.7v13.5c0,12.7 -2,24.3 -5.7,34.8a72.8,72.8 0,0 1,-41.6 44.4,85.5 85.5,0 0,1 -34.3,6.3L920,1357.8v-6.6l-0.4,6.8 53.8,53.5h622L1416,1232l-58.4,-58.4h-0.3l-58,184.1h -20.4l-44.7,-141.3zM1245.8,1173.5l43,146.5 23.7,-79.7zM972.1,1173.8zM943.8,1192.5v146.1h18.9a62,62 0,0 0,25.8 -5.2,50.3 50.3,0 0,0 18,-14c4.9,-6 8.4,-13 10.7,-21 2.3,-8 3.6,-16.7 3.7,-26v-13.9c-0.1,-9.4 -1.4,-18 -3.7,-26 -2.4,-8 -6,-15 -10.7,-20.7a49.3,49.3 0,0 0,-18 -14,63.4 63.4,0 0,0 -25.8,-5.3zM1022.6,1197.3l2,2.1 -2,-2z"
+        android:strokeWidth="1.9"
+        android:strokeColor="#000" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M920,1357.7v-184.5h42.7q19.3,0.3 34.3,6.6 15.2,6.2 25.6,17.5 10.6,11.2 16,26.9 5.6,15.6 5.7, 34.6v13.5q-0.1,19 -5.7,34.7 -5.4,15.6 -16,26.9 -10.4,11.2 -25.6,17.5 -15,6.2 -34.3,6.3zM943.8,1192.5v146.1h18.9q15, -0.1 25.8,-5.2 11,-5.2 18,-14 7.3,-9 10.7,-21 3.5,-12 3.6,-26v-13.9q0,-14 -3.6,-26t-10.7,-20.7q-7,-9 -18,-14 -10.9,-5 -25.8,-5.3zM1179.5,1272.5h-77v65.4h89.8v19.9L1079,1357.8v-184.6h112.2v20h-88.7v59.4h77zM1288.9, 1320l43.6,-146.8h25l-58.2,184.6h-20.4l-58.3,-184.6h25z"
+        android:strokeWidth="1"
+        android:strokeColor="#000" />
+</vector>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1f..7dbec2cb9 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..7dbec2cb9 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/values/ic_launcher_background.xml b/app/src/debug/res/values/ic_launcher_background.xml
deleted file mode 100644
index 9646c0b4e..000000000
--- a/app/src/debug/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#D32F2F</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5e4292f6e..c644c8633 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 85070edc5..e3047c7fe 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -13,6 +13,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.CrashlyticsTree
@@ -29,6 +30,9 @@ class WulkanowyApp : DaggerApplication() {
     @Inject
     lateinit var workerFactory: SyncWorkerFactory
 
+    @Inject
+    lateinit var themeManager: ThemeManager
+
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -41,6 +45,7 @@ class WulkanowyApp : DaggerApplication() {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
+        themeManager.applyDefaultTheme()
 
         initWorkManager()
         initLogging()
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
index a963e9a96..8926cdf47 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@@ -6,14 +6,15 @@ import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
 
+@Suppress("unused")
 @Module
 internal abstract class BuilderModule {
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index 84409a845..05f67454c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -28,6 +28,7 @@ import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
+@Suppress("unused")
 @AssistedModule
 @Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 6a4c4ca6d..192698999 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -64,7 +64,7 @@ class SyncWorker @AssistedInject constructor(
     private fun notify(result: Result) {
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
             .setContentTitle("Debug notification")
-            .setSmallIcon(R.drawable.ic_more_settings_24dp)
+            .setSmallIcon(R.drawable.ic_more_settings)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 0c70b476f..cd863568b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class GradeWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
             .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_grade)
+            .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
             .setDefaults(DEFAULT_ALL)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.GRADE.id,
-                    MainActivity.getStartIntent(context, MenuView.GRADE, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.GRADE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
                 grades.forEach { addLine("${it.subject}: ${it.entry}") }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index ebd536b75..1e366d58c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class LuckyNumberWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
             .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
-            .setSmallIcon(R.drawable.ic_stat_notify_lucky_number)
+            .setSmallIcon(R.drawable.ic_stat_luckynumber)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
             .build())
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index d5016aeed..c94f3aaf2 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -16,7 +16,7 @@ import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -42,14 +42,14 @@ class MessageWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
             .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_message)
+            .setSmallIcon(R.drawable.ic_stat_message)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MenuView.MESSAGE, true), FLAG_UPDATE_CURRENT)
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.MESSAGE, true), FLAG_UPDATE_CURRENT)
             )
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index 86e540c43..235ef201e 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class NoteWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size))
             .setContentText(context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_note)
+            .setSmallIcon(R.drawable.ic_stat_note)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.NOTE.id,
-                    MainActivity.getStartIntent(context, MenuView.NOTE, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.NOTE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.NOTE, true), FLAG_UPDATE_CURRENT))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
                 notes.forEach { addLine("${it.teacher}: ${it.category}") }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 6fc72d06d..f0e51e314 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -1,5 +1,8 @@
 package io.github.wulkanowy.ui.base
 
+import android.app.ActivityManager
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Bundle
@@ -16,6 +19,7 @@ import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
+import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
 abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView, HasAndroidInjector {
@@ -35,10 +39,15 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
-        themeManager.applyTheme(this)
+        themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+        if (SDK_INT >= LOLLIPOP) {
+            @Suppress("DEPRECATION")
+            setTaskDescription(ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)))
+        }
     }
 
     override fun showError(text: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
index 449f451be..5b347fe81 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -2,29 +2,31 @@ package io.github.wulkanowy.ui.base
 
 import android.content.pm.PackageManager.GET_ACTIVITIES
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ThemeManager @Inject constructor(private val preferencesRepository: PreferencesRepository) {
 
-    fun applyTheme(activity: AppCompatActivity) {
+    fun applyActivityTheme(activity: AppCompatActivity) {
         if (isThemeApplicable(activity)) {
-            activity.delegate.apply {
-                when (preferencesRepository.appTheme) {
-                    "light" -> setLocalNightMode(MODE_NIGHT_NO)
-                    "dark" -> setLocalNightMode(MODE_NIGHT_YES)
-                    "black" -> {
-                        setLocalNightMode(MODE_NIGHT_YES)
-                        activity.setTheme(R.style.WulkanowyTheme_Black)
-                    }
-                }
-            }
+            applyDefaultTheme()
+            if (preferencesRepository.appTheme == "black") activity.setTheme(R.style.WulkanowyTheme_Black)
         }
     }
 
+    fun applyDefaultTheme() {
+        AppCompatDelegate.setDefaultNightMode(
+            if (preferencesRepository.appTheme == "light") MODE_NIGHT_NO
+            else MODE_NIGHT_YES
+        )
+    }
+
     private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
         return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
             .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 79373be98..46dc5cfe8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -1,19 +1,29 @@
 package io.github.wulkanowy.ui.modules.about
 
 import android.content.Intent
+import android.content.Intent.ACTION_SENDTO
+import android.content.Intent.EXTRA_EMAIL
+import android.content.Intent.EXTRA_SUBJECT
+import android.content.Intent.EXTRA_TEXT
+import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.aboutlibraries.LibsFragmentCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.withOnExtraListener
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
 
 class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
@@ -22,63 +32,94 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
     lateinit var presenter: AboutPresenter
 
     @Inject
-    lateinit var fragmentCompat: LibsFragmentCompat
+    lateinit var aboutAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var appInfo: AppInfo
 
+    override val versionRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_version), "${appInfo.versionName} (${appInfo.versionCode})", getCompatDrawable(R.drawable.ic_all_about))
+        }
+
+    override val feedbackRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_feedback), getString(R.string.about_feedback_summary), getCompatDrawable(R.drawable.ic_about_feedback))
+        }
+
+    override val discordRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
+        }
+
+    override val homepageRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_homepage), getString(R.string.about_homepage_summary), getCompatDrawable(R.drawable.ic_about_homepage))
+        }
+
+    override val licensesRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_licenses), getString(R.string.about_licenses_summary), getCompatDrawable(R.drawable.ic_about_licenses))
+        }
+
+    override val privacyRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_privacy), getString(R.string.about_privacy_summary), getCompatDrawable(R.drawable.ic_about_privacy))
+        }
+
+    override val titleStringId get() = R.string.about_title
+
     companion object {
         fun newInstance() = AboutFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.about_title
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        presenter.onAttachView(this)
-        return Bundle().apply {
-            putSerializable("data", LibsBuilder()
-                .withAboutAppName(getString(R.string.app_name))
-                .withAboutVersionShown(true)
-                .withAboutIconShown(true)
-                .withLicenseShown(true)
-                .withAboutSpecial1(getString(R.string.about_discord_invite))
-                .withAboutSpecial2(getString(R.string.about_homepage))
-                .withAboutSpecial3(getString(R.string.about_feedback))
-                .withFields(R.string::class.java.fields)
-                .withCheckCachedDetection(false)
-                .withExcludedLibraries("fastadapter", "AndroidIconics", "Jsoup", "Retrofit", "okio",
-                    "Butterknife", "CircleImageView")
-                .withOnExtraListener { presenter.onExtraSelect(it) })
-        }.let {
-            fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
-        }
+        return inflater.inflate(R.layout.fragment_about, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fragmentCompat.onViewCreated(view, savedInstanceState)
+        presenter.onAttachView(this)
     }
 
-    override fun openDiscordInviteView() {
+    override fun initView() {
+        aboutAdapter.setOnItemClickListener(presenter::onItemSelected)
+
+        with(aboutRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = aboutAdapter
+        }
+    }
+
+    override fun updateData(header: AboutScrollableHeader, items: List<AboutItem>) {
+        with(aboutAdapter) {
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
+            updateDataSet(items)
+        }
+    }
+
+    override fun openDiscordInvite() {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openHomepageWebView() {
+    override fun openHomepage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
     }
 
-    override fun openEmailClientView() {
-        val intent = Intent(Intent.ACTION_SENDTO).apply {
-            data = Uri.parse("mailto:")
-            putExtra(Intent.EXTRA_EMAIL, Array(1) { "wulkanowyinc@gmail.com" })
-            putExtra(Intent.EXTRA_SUBJECT, "Zgłoszenie błędu")
-            putExtra(Intent.EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
-                Build: ${appInfo.versionCode}
-                SDK: ${appInfo.systemVersion}
-                Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
-            """.trimIndent())
-        }
+    override fun openEmailClient() {
+        val intent = Intent(ACTION_SENDTO)
+            .apply {
+                data = Uri.parse("mailto:")
+                putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
+                putExtra(EXTRA_SUBJECT, "Zgłoszenie błędu")
+                putExtra(EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n${"-".repeat(40)}\n " +
+                    """
+                        Build: ${appInfo.versionCode}
+                        SDK: ${appInfo.systemVersion}
+                        Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
+                    """.trimIndent())
+            }
 
         context?.let {
             if (intent.resolveActivity(it.packageManager) != null) {
@@ -89,8 +130,15 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         }
     }
 
+    override fun openLicenses() {
+        (activity as? MainActivity)?.pushView(LicenseFragment.newInstance())
+    }
+
+    override fun openPrivacyPolicy() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
+    }
+
     override fun onDestroyView() {
-        fragmentCompat.onDestroyView()
         presenter.onDetachView()
         super.onDestroyView()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
new file mode 100644
index 000000000..29f1cd8c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
@@ -0,0 +1,56 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_about.*
+
+class AboutItem(
+    val title: String,
+    private val summary: String,
+    private val image: Drawable?
+) : AbstractFlexibleItem<AboutItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            aboutItemImage.setImageDrawable(image)
+            aboutItemTitle.text = title
+            aboutItemSummary.text = summary
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AboutItem
+
+        if (title != other.title) return false
+        if (summary != other.summary) return false
+        if (image != other.image) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = title.hashCode()
+        result = 31 * result + summary.hashCode()
+        result = 31 * result + (image?.hashCode() ?: 0)
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
deleted file mode 100644
index cc5ba7cf3..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import com.mikepenz.aboutlibraries.LibsFragmentCompat
-import dagger.Module
-import dagger.Provides
-import io.github.wulkanowy.di.scopes.PerFragment
-
-@Module
-class AboutModule {
-
-    @PerFragment
-    @Provides
-    fun provideLibsFragmentCompat() = LibsFragmentCompat()
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 736bf0ce8..5303d3619 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -1,9 +1,6 @@
 package io.github.wulkanowy.ui.modules.about
 
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL1
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL2
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL3
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -21,28 +18,53 @@ class AboutPresenter @Inject constructor(
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
+        view.initView()
         Timber.i("About view was initialized")
+        loadData()
     }
 
-    fun onExtraSelect(type: Libs.SpecialButton?) {
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is AboutItem) return
         view?.run {
-            when (type) {
-                SPECIAL1 -> {
-                    Timber.i("Opening discord invide page")
-                    analytics.logEvent("open_page", "name" to "discord")
-                    openDiscordInviteView()
+            when (item.title) {
+                feedbackRes?.first -> {
+                    Timber.i("Opening email client ")
+                    openEmailClient()
+                    analytics.logEvent("about_open", "name" to "feedback")
                 }
-                SPECIAL2 -> {
-                    Timber.i("Opening home page")
-                    analytics.logEvent("open_page", "name" to "home")
-                    openHomepageWebView()
+                discordRes?.first -> {
+                    Timber.i("Opening discord")
+                    openDiscordInvite()
+                    analytics.logEvent("about_open", "name" to "discord")
                 }
-                SPECIAL3 -> {
-                    Timber.i("Opening email client")
-                    analytics.logEvent("open_page", "name" to "email")
-                    openEmailClientView()
+                homepageRes?.first -> {
+                    Timber.i("Opening homepage")
+                    openHomepage()
+                    analytics.logEvent("about_open", "name" to "homepage")
+                }
+                licensesRes?.first -> {
+                    Timber.i("Opening licenses view")
+                    openLicenses()
+                    analytics.logEvent("about_open", "name" to "licenses")
+                }
+                privacyRes?.first -> {
+                    Timber.i("Opening privacy page ")
+                    openPrivacyPolicy()
+                    analytics.logEvent("about_open", "name" to "privacy")
                 }
             }
         }
     }
+
+    private fun loadData() {
+        view?.run {
+            updateData(AboutScrollableHeader(), listOfNotNull(
+                versionRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                feedbackRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                discordRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                homepageRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                licensesRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                privacyRes?.let { (title, summary, image) -> AboutItem(title, summary, image) }))
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
new file mode 100644
index 000000000..07bb41249
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.view.View
+import androidx.core.content.res.ResourcesCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_about.*
+
+class AboutScrollableHeader : AbstractFlexibleItem<AboutScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            val context = contentView.context
+            val drawable = ResourcesCompat.getDrawableForDensity(context.resources, context.applicationInfo.icon, 640, null)
+
+            aboutScrollableHeaderIcon.setImageDrawable(drawable)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return true
+    }
+
+    override fun hashCode() = javaClass.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index 5b206ad82..318a75e4a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -1,12 +1,33 @@
 package io.github.wulkanowy.ui.modules.about
 
+import android.graphics.drawable.Drawable
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AboutView : BaseView {
 
-    fun openDiscordInviteView()
+    val versionRes: Triple<String, String, Drawable?>?
 
-    fun openEmailClientView()
+    val feedbackRes: Triple<String, String, Drawable?>?
 
-    fun openHomepageWebView()
+    val discordRes: Triple<String, String, Drawable?>?
+
+    val homepageRes: Triple<String, String, Drawable?>?
+
+    val licensesRes: Triple<String, String, Drawable?>?
+
+    val privacyRes: Triple<String, String, Drawable?>?
+
+    fun initView()
+
+    fun updateData(header: AboutScrollableHeader, items: List<AboutItem>)
+
+    fun openDiscordInvite()
+
+    fun openEmailClient()
+
+    fun openHomepage()
+
+    fun openLicenses()
+
+    fun openPrivacyPolicy()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
new file mode 100644
index 000000000..19d1323ac
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -0,0 +1,87 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.text.HtmlCompat
+import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
+import com.mikepenz.aboutlibraries.Libs
+import com.mikepenz.aboutlibraries.entity.Library
+import dagger.Lazy
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_license.*
+import javax.inject.Inject
+
+class LicenseFragment : BaseFragment(), LicenseView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LicensePresenter
+
+    @Inject
+    lateinit var licenseAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    @Inject
+    lateinit var libs: Lazy<Libs>
+
+    override val titleStringId get() = R.string.license_title
+
+    override val appLibraries: ArrayList<Library>?
+        get() = context?.let {
+            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+        }
+
+    companion object {
+        fun newInstance() = LicenseFragment()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_license, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(licenseRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = licenseAdapter
+        }
+        licenseAdapter.setOnItemClickListener(presenter::onItemSelected)
+    }
+
+    override fun updateData(data: List<LicenseItem>) {
+        licenseAdapter.updateDataSet(data)
+    }
+
+    override fun openLicense(licenseHtml: String) {
+        context?.let {
+            AlertDialog.Builder(it).apply {
+                setTitle(R.string.license_dialog_title)
+                setMessage(HtmlCompat.fromHtml(licenseHtml, FROM_HTML_MODE_LEGACY))
+                setPositiveButton(android.R.string.ok) { _, _ -> }
+                show()
+            }
+        }
+    }
+
+    override fun showProgress(show: Boolean) {
+        licenseProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
new file mode 100644
index 000000000..98c86e75a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.view.View
+import com.mikepenz.aboutlibraries.entity.Library
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_license.*
+
+class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_license
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            licenseItemName.text = library.libraryName
+            licenseItemSummary.text = library.license?.licenseName
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as LicenseItem
+
+        if (library != other.library) return false
+
+        return true
+    }
+
+    override fun hashCode() = library.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
new file mode 100644
index 000000000..0ffc3d90e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.content.Context
+import com.mikepenz.aboutlibraries.Libs
+import dagger.Module
+import dagger.Provides
+import io.github.wulkanowy.di.scopes.PerFragment
+
+@Module
+class LicenseModule {
+
+    @PerFragment
+    @Provides
+    fun provideLibs(context: Context) = Libs(context)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
new file mode 100644
index 000000000..b5b8fcd13
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
+import javax.inject.Inject
+
+class LicensePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository
+) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: LicenseView) {
+        super.onAttachView(view)
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is LicenseItem) return
+        view?.run { item.library.license?.licenseDescription?.let { openLicense(it) } }
+    }
+
+    private fun loadData() {
+        disposable.add(Single.fromCallable { view?.appLibraries }
+            .map {
+                val exclude = listOf("Android-Iconics", "CircleImageView", "FastAdapter", "Jsoup", "okio", "Retrofit")
+                it.filter { library -> !exclude.contains(library.libraryName) }
+            }
+            .map { it.map { library -> LicenseItem(library) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnEvent { _, _ -> view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
new file mode 100644
index 000000000..3939d3e80
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import com.mikepenz.aboutlibraries.entity.Library
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LicenseView : BaseView {
+
+    val appLibraries: ArrayList<Library>?
+
+    fun initView()
+
+    fun updateData(data: List<LicenseItem>)
+
+    fun openLicense(licenseHtml: String)
+
+    fun showProgress(show: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index f3131098a..f61753c92 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -60,9 +60,7 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun initView() {
-        attendanceAdapter.apply {
-            setOnItemClickListener { presenter.onAttendanceItemSelected(it) }
-        }
+        attendanceAdapter.setOnItemClickListener { presenter.onAttendanceItemSelected(it) }
 
         attendanceRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index eb5e3669b..b37fda74e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -78,6 +78,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             offscreenPageLimit = 3
             setOnSelectPageListener { presenter.onPageSelected(it) }
         }
+
         gradeTabLayout.setupWithViewPager(gradeViewPager)
         gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
index 46a923d9a..52cf087bd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -10,6 +10,7 @@ import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
 import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
+@Suppress("unused")
 @Module
 abstract class GradeModule {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index a1cea6dff..a1257f57f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -81,9 +81,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
             setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
             animateXY(1000, 1000)
             minAngleForSlices = 25f
-            legend.apply {
-                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-            }
+            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
         }
 
         context?.let {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
index 7c3e7bace..a0b98be72 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -10,6 +10,7 @@ import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
+@Suppress("unused")
 @Module
 internal abstract class LoginModule {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 93db3679c..54d369dc2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -17,7 +17,6 @@ import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.setOnItemSelectedListener
 import io.github.wulkanowy.utils.setOnTextChangedListener
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_form.*
@@ -42,7 +41,11 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         get() = loginFormPass.text.toString()
 
     override val formHostValue: String?
-        get() = resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
+
+    private lateinit var hostKeys: Array<String>
+
+    private lateinit var hostValues: Array<String>
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_login_form, container, false)
@@ -54,9 +57,12 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun initView() {
+        hostKeys = resources.getStringArray(R.array.endpoints_keys)
+        hostValues = resources.getStringArray(R.array.endpoints_values)
+
         loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
         loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
-        loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
         loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
         loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
 
@@ -64,13 +70,14 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
             if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
         }
 
-        context?.let {
-            loginFormHost.adapter = ArrayAdapter.createFromResource(it, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
-                .apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
+        with(loginFormHost) {
+            setText(hostKeys.getOrElse(0) { "" })
+            setAdapter(ArrayAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            keyListener = null
         }
     }
 
-    override fun setDefaultCredentials(name: String, pass: String) {
+    override fun setCredentials(name: String, pass: String) {
         loginFormName.setText(name)
         loginFormPass.setText(pass)
     }
@@ -143,7 +150,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
             loginFormName.text.toString(),
             loginFormPass.text.toString(),
-            resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+            resources.getStringArray(R.array.endpoints_values)[1]
         ))
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 540a91be8..6949200c6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -40,7 +40,7 @@ class LoginFormPresenter @Inject constructor(
         view?.apply {
             clearPassError()
             clearNameError()
-            if (formHostValue?.contains("fakelog") == true) setDefaultCredentials("jan@fakelog.cf", "jan123")
+            if (formHostValue?.contains("fakelog") == true) setCredentials("jan@fakelog.cf", "jan123")
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 80a7b5e9c..2532547a0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -13,7 +13,7 @@ interface LoginFormView : BaseView {
 
     val formHostValue: String?
 
-    fun setDefaultCredentials(name: String, pass: String)
+    fun setCredentials(name: String, pass: String)
 
     fun setErrorNameRequired()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
index 27723c538..fa21cff94 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
@@ -48,7 +48,7 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
             get() = itemView
 
         init {
-            loginItemCheck.setOnClickListener { super.onClick(loginItemContainer) }
+            loginItemCheck.keyListener = null
         }
 
         override fun onClick(view: View?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index 66141c913..44d47d05a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -27,7 +27,7 @@ import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Maybe
 import timber.log.Timber
@@ -74,8 +74,8 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
                     getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)?.luckyNumber?.toString() ?: "#"
                 )
                 setOnClickPendingIntent(R.id.luckyNumberWidgetContainer,
-                    PendingIntent.getActivity(context, MenuView.LUCKY_NUMBER.id,
-                        MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+                    PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
+                        MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
             }.also {
                 setStyles(it, intent)
                 appWidgetManager.updateAppWidget(appWidgetId, it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 779f0a49e..4c7f77593 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -4,16 +4,21 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
+import dagger.Lazy
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
@@ -26,8 +31,9 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.safelyPopFragment
+import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
 import kotlinx.android.synthetic.main.activity_main.*
 import javax.inject.Inject
@@ -40,10 +46,13 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     @Inject
     lateinit var navController: FragNavController
 
+    @Inject
+    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
+
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
 
-        fun getStartIntent(context: Context, startMenu: MainView.MenuView? = null, clear: Boolean = false): Intent {
+        fun getStartIntent(context: Context, startMenu: MainView.Section? = null, clear: Boolean = false): Intent {
             return Intent(context, MainActivity::class.java)
                 .apply {
                     if (clear) flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
@@ -52,24 +61,21 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         }
     }
 
-    override val isRootView: Boolean
-        get() = navController.isRootFragment
+    override val isRootView get() = navController.isRootFragment
 
-    override val currentViewTitle: String?
-        get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
+    override val currentStackSize get() = navController.currentStack?.size
 
-    override val currentStackSize: Int?
-        get() = navController.currentStack?.size
+    override val currentViewTitle get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
 
     override var startMenuIndex = 0
 
     override var startMenuMoreIndex = -1
 
-    private val moreMenuFragments = listOf<Fragment>(
-        MessageFragment.newInstance(),
-        HomeworkFragment.newInstance(),
-        NoteFragment.newInstance(),
-        LuckyNumberFragment.newInstance()
+    private val moreMenuFragments = mapOf<Int, Fragment>(
+        MainView.Section.MESSAGE.id to MessageFragment.newInstance(),
+        MainView.Section.HOMEWORK.id to HomeworkFragment.newInstance(),
+        MainView.Section.NOTE.id to NoteFragment.newInstance(),
+        MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance()
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -78,11 +84,11 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         setSupportActionBar(mainToolbar)
         messageContainer = mainFragmentContainer
 
-        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.MenuView)
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
 
-        navController.run {
+        with(navController) {
             initialize(startMenuIndex, savedInstanceState)
-            pushFragment(moreMenuFragments.getOrNull(startMenuMoreIndex))
+            pushFragment(moreMenuFragments[startMenuMoreIndex])
         }
     }
 
@@ -92,30 +98,31 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     }
 
     override fun initView() {
-        mainBottomNav.run {
-            addItems(
-                listOf(
-                    AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_menu_main_grade_26dp, 0),
-                    AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_menu_main_attendance_24dp, 0),
-                    AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_menu_main_exam_24dp, 0),
-                    AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_menu_main_timetable_24dp, 0),
-                    AHBottomNavigationItem(R.string.more_title, R.drawable.ic_menu_main_more_24dp, 0)
-                )
-            )
-            accentColor = ContextCompat.getColor(context, R.color.colorPrimary)
-            inactiveColor = getThemeAttrColor(android.R.attr.textColorSecondary)
-            defaultBackgroundColor = getThemeAttrColor(R.attr.bottomNavBackground)
+        with(mainToolbar) {
+            if (SDK_INT >= LOLLIPOP) stateListAnimator = null
+            setBackgroundColor(overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(4f)))
+        }
+
+        with(mainBottomNav) {
+            addItems(listOf(
+                AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
+                AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_main_attendance, 0),
+                AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0),
+                AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_main_timetable, 0),
+                AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
+            ))
+            accentColor = getThemeAttrColor(R.attr.colorPrimary)
+            inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153)
+            defaultBackgroundColor = overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
             setTitleTextSizeInSp(10f, 10f)
-            setOnTabSelectedListener { position, wasSelected ->
-                presenter.onTabSelected(position, wasSelected)
-            }
+            setOnTabSelectedListener(presenter::onTabSelected)
         }
 
-        navController.run {
-            setOnViewChangeListener { presenter.onViewChange() }
+        with(navController) {
+            setOnViewChangeListener(presenter::onViewChange)
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
                 GradeFragment.newInstance(),
@@ -152,6 +159,10 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         navController.showDialogFragment(AccountDialog.newInstance())
     }
 
+    override fun showActionBarElevation(show: Boolean) {
+        ViewCompat.setElevation(mainToolbar, if (show) dpToPx(4f) else 0f)
+    }
+
     override fun notifyMenuViewReselected() {
         (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentReselected()
     }
@@ -164,8 +175,8 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         navController.pushFragment(fragment)
     }
 
-    override fun popView() {
-        navController.safelyPopFragment()
+    override fun popView(depth: Int) {
+        navController.safelyPopFragments(depth)
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
index cc69005e1..9444d58df 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.main
 
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import dagger.Module
 import dagger.Provides
@@ -7,7 +8,8 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
-import io.github.wulkanowy.ui.modules.about.AboutModule
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseModule
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
@@ -19,15 +21,16 @@ import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.MessageModule
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceModule
+import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 
+@Suppress("unused")
 @Module
 abstract class MainModule {
 
@@ -39,6 +42,11 @@ abstract class MainModule {
         fun provideFragNavController(activity: MainActivity): FragNavController {
             return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
         }
+
+        //In activities must be injected as Lazy
+        @JvmStatic
+        @Provides
+        fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
     }
 
     @PerFragment
@@ -74,7 +82,7 @@ abstract class MainModule {
     abstract fun bindTimetableFragment(): TimetableFragment
 
     @PerFragment
-    @ContributesAndroidInjector(modules = [AboutModule::class])
+    @ContributesAndroidInjector
     abstract fun bindAboutFragment(): AboutFragment
 
     @PerFragment
@@ -108,4 +116,8 @@ abstract class MainModule {
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [LicenseModule::class])
+    abstract fun bindLicenseFragment(): LicenseFragment
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index a74226bfe..07e4c8d0e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -5,6 +5,8 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.main.MainView.Section.GRADE
+import io.github.wulkanowy.ui.modules.main.MainView.Section.MESSAGE
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
@@ -19,7 +21,7 @@ class MainPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
 
-    fun onAttachView(view: MainView, initMenu: MainView.MenuView?) {
+    fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
         view.apply {
             getProperViewIndexes(initMenu).let { (main, more) ->
@@ -34,8 +36,9 @@ class MainPresenter @Inject constructor(
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onViewChange() {
+    fun onViewChange(section: MainView.Section?) {
         view?.apply {
+            showActionBarElevation(section != GRADE && section != MESSAGE)
             currentViewTitle?.let { setViewTitle(it) }
             currentStackSize?.let {
                 if (it > 1) showHomeArrow(true)
@@ -77,10 +80,10 @@ class MainPresenter @Inject constructor(
         } == true
     }
 
-    private fun getProperViewIndexes(initMenu: MainView.MenuView?): Pair<Int, Int> {
-        return when {
-            initMenu?.id in 0..3 -> initMenu!!.id to -1
-            (initMenu?.id ?: 0) > 3 -> 4 to initMenu!!.id - 4
+    private fun getProperViewIndexes(initMenu: MainView.Section?): Pair<Int, Int> {
+        return when (initMenu?.id) {
+            in 0..3 -> initMenu!!.id to -1
+            in 4..10 -> 4 to initMenu!!.id
             else -> prefRepository.startMenuIndex to -1
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 6aef573e3..c53adc5b9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -22,11 +22,13 @@ interface MainView : BaseView {
 
     fun showAccountPicker()
 
+    fun showActionBarElevation(show: Boolean)
+
     fun notifyMenuViewReselected()
 
     fun setViewTitle(title: String)
 
-    fun popView()
+    fun popView(depth: Int = 1)
 
     interface MainChildView {
 
@@ -38,14 +40,17 @@ interface MainView : BaseView {
         val titleStringId: Int
     }
 
-    enum class MenuView(val id: Int) {
+    enum class Section(val id: Int) {
         GRADE(0),
         ATTENDANCE(1),
         EXAM(2),
         TIMETABLE(3),
-        MESSAGE(4),
-        HOMEWORK(5),
-        NOTE(6),
-        LUCKY_NUMBER(7),
+        MORE(4),
+        MESSAGE(5),
+        HOMEWORK(6),
+        NOTE(7),
+        LUCKY_NUMBER(8),
+        SETTINGS(9),
+        ABOUT(10)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
index e4c202d9f..c772466fc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -8,6 +8,7 @@ import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
+@Suppress("unused")
 @Module
 abstract class MessageModule {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
deleted file mode 100644
index be433b008..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.send
-
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import com.pchmn.materialchips.model.ChipInterface
-import io.github.wulkanowy.data.db.entities.Recipient
-
-class RecipientChip(var recipient: Recipient) : ChipInterface {
-
-    override fun getAvatarDrawable(): Drawable? = null
-
-    override fun getAvatarUri(): Uri? = null
-
-    override fun getId(): Any = recipient.id
-
-    override fun getLabel(): String = recipient.name
-
-    override fun getInfo(): String {
-        return recipient.realName.run {
-            substringBeforeLast("-").let { sub ->
-                when {
-                    (sub == this) -> this
-                    (sub.indexOf('(') != -1) -> indexOf("(").let { substring(if (it != -1) it else 0) }
-                    (sub.indexOf('[') != -1) -> indexOf("[").let { substring(if (it != -1) it else 0) }
-                    else -> substringAfter('-')
-                }
-            }.trim()
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
new file mode 100644
index 000000000..dd2d2b9bd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.materialchipsinput.ChipItem
+
+data class RecipientChipItem(
+
+    override val title: String,
+
+    override val summary: String,
+
+    val recipient: Recipient
+
+) : ChipItem
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 5c6e74b08..7b15da713 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -2,18 +2,20 @@ package io.github.wulkanowy.ui.modules.message.send
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Rect
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.TouchDelegate
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.activity_send_message.*
@@ -38,14 +40,18 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         }
     }
 
-    override val formRecipientsData: List<Recipient>
-        get() = (sendMessageRecipientsInput.selectedChipList).map { (it as RecipientChip).recipient }
+    override val isDropdownListVisible: Boolean
+        get() = sendMessageTo.isDropdownListVisible
+
+    @Suppress("UNCHECKED_CAST")
+    override val formRecipientsData: List<RecipientChipItem>
+        get() = sendMessageTo.addedChipItems as List<RecipientChipItem>
 
     override val formSubjectValue: String
-        get() = sendMessageSubjectInput.text.toString()
+        get() = sendMessageSubject.text.toString()
 
     override val formContentValue: String
-        get() = sendMessageContentInput.text.toString()
+        get() = sendMessageMessageContent.text.toString()
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -66,6 +72,12 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
+    override fun initView() {
+        setUpExtendedHitArea()
+        sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+        sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.action_menu_send_message, menu)
         return true
@@ -81,15 +93,15 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setReportingUnit(unit: ReportingUnit) {
-        sendMessageFromTextView.setText(unit.senderName)
+        sendMessageFrom.text = unit.senderName
     }
 
-    override fun setRecipients(recipients: List<Recipient>) {
-        sendMessageRecipientsInput.filterableList = recipients.map { RecipientChip(it) }
+    override fun setRecipients(recipients: List<RecipientChipItem>) {
+        sendMessageTo.filterableChipItems = recipients
     }
 
-    override fun setSelectedRecipients(recipients: List<Recipient>) {
-        recipients.map { sendMessageRecipientsInput.addChip(RecipientChip(it)) }
+    override fun setSelectedRecipients(recipients: List<RecipientChipItem>) {
+        sendMessageTo.addChips(recipients)
     }
 
     override fun showProgress(show: Boolean) {
@@ -109,11 +121,11 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setSubject(subject: String) {
-        sendMessageSubjectInput.setText(subject)
+        sendMessageSubject.setText(subject)
     }
 
     override fun setContent(content: String) {
-        sendMessageContentInput.setText(content)
+        sendMessageMessageContent.setText(content)
     }
 
     override fun showMessage(text: String) {
@@ -124,7 +136,41 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         if (show) showSoftInput() else hideSoftInput()
     }
 
+    override fun hideDropdownList() {
+        sendMessageTo.hideDropdownList()
+    }
+
+    override fun scrollToRecipients() {
+        sendMessageScroll.post {
+            sendMessageScroll.scrollTo(0, sendMessageTo.bottom - dpToPx(53f).toInt())
+        }
+    }
+
     override fun popView() {
         onBackPressed()
     }
+
+    private fun setUpExtendedHitArea() {
+        fun extendHitArea() {
+            val containerHitRect = Rect().apply {
+                sendMessageContent.getHitRect(this)
+            }
+
+            val contentHitRect = Rect().apply {
+                sendMessageMessageContent.getHitRect(this)
+            }
+
+            contentHitRect.top = contentHitRect.bottom
+            contentHitRect.bottom = containerHitRect.bottom
+
+            sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, sendMessageMessageContent)
+        }
+
+        sendMessageMessageContent.post {
+            sendMessageMessageContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                extendHitArea()
+            }
+            extendHitArea()
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 4808fafcc..3b89b5cae 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -32,6 +32,7 @@ class SendMessagePresenter @Inject constructor(
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
+        view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
         view.apply {
@@ -54,15 +55,47 @@ class SendMessagePresenter @Inject constructor(
         }
     }
 
+    fun onTouchScroll(): Boolean {
+        return view?.run {
+            if (isDropdownListVisible) {
+                hideDropdownList()
+                true
+            } else false
+        } == true
+    }
+
+    fun onRecipientsTextChange(text: String) {
+        if (text.isBlank()) return
+        view?.scrollToRecipients()
+    }
+
     fun onUpNavigate(): Boolean {
         view?.popView()
         return true
     }
 
+    fun onSend(): Boolean {
+        view?.run {
+            when {
+                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
+                formContentValue.length < 3 -> showMessage(messageContentMinLength)
+                else -> {
+                    sendMessage(
+                        subject = formSubjectValue,
+                        content = formContentValue,
+                        recipients = formRecipientsData.map { it.recipient }
+                    )
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     private fun loadData(message: Message?, reply: Boolean?) {
         var reportingUnit: ReportingUnit? = null
-        var recipients: List<Recipient> = emptyList()
-        var selectedRecipient: List<Recipient> = emptyList()
+        var recipientChips: List<RecipientChipItem> = emptyList()
+        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
 
         Timber.i("Loading recipients started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -73,14 +106,14 @@ class SendMessagePresenter @Inject constructor(
                     .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
                     .doOnSuccess {
                         Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
-                        recipients = it
+                        recipientChips = createChips(it)
                     }
                     .flatMapCompletable {
                         if (message == null || reply != true) Completable.complete()
                         else recipientRepository.getMessageRecipients(student, message)
                             .doOnSuccess {
                                 Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
-                                selectedRecipient = it
+                                selectedRecipientChips = createChips(it)
                             }
                             .ignoreElement()
                     }
@@ -95,11 +128,11 @@ class SendMessagePresenter @Inject constructor(
             }
             .doFinally { view?.run { showProgress(false) } }
             .subscribe({
-                view?.apply {
+                view?.run {
                     if (reportingUnit !== null) {
                         reportingUnit?.let { setReportingUnit(it) }
-                        setRecipients(recipients)
-                        if (selectedRecipient.isNotEmpty()) setSelectedRecipients(selectedRecipient)
+                        setRecipients(recipientChips)
+                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
                         showContent(true)
                     } else {
                         Timber.e("Loading recipients result: Can't find the reporting unit")
@@ -145,21 +178,29 @@ class SendMessagePresenter @Inject constructor(
         )
     }
 
-    fun onSend(): Boolean {
-        view?.run {
-            when {
-                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
-                formContentValue.length < 3 -> showMessage(messageContentMinLength)
-                else -> {
-                    sendMessage(
-                        subject = formSubjectValue,
-                        content = formContentValue,
-                        recipients = formRecipientsData
-                    )
-                    return true
+    private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
+        fun generateCorrectSummary(recipientRealName: String): String {
+            val substring = recipientRealName.substringBeforeLast("-")
+            return when {
+                substring == recipientRealName -> recipientRealName
+                substring.indexOf("(") != -1 -> {
+                    recipientRealName.indexOf("(")
+                        .let { recipientRealName.substring(if (it != -1) it else 0) }
                 }
-            }
+                substring.indexOf("[") != -1 -> {
+                    recipientRealName.indexOf("[")
+                        .let { recipientRealName.substring(if (it != -1) it else 0) }
+                }
+                else -> recipientRealName.substringAfter("-")
+            }.trim()
+        }
+
+        return recipients.map {
+            RecipientChipItem(
+                title = it.name,
+                summary = generateCorrectSummary(it.realName),
+                recipient = it
+            )
         }
-        return false
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
index 8a2cb4f61..2839f9ce7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.message.send
 
-import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.ui.base.BaseView
 
 interface SendMessageView : BaseView {
 
-    val formRecipientsData: List<Recipient>
+    val isDropdownListVisible: Boolean
+
+    val formRecipientsData: List<RecipientChipItem>
 
     val formSubjectValue: String
 
@@ -18,11 +19,13 @@ interface SendMessageView : BaseView {
 
     val messageSuccess: String
 
+    fun initView()
+
     fun setReportingUnit(unit: ReportingUnit)
 
-    fun setRecipients(recipients: List<Recipient>)
+    fun setRecipients(recipients: List<RecipientChipItem>)
 
-    fun setSelectedRecipients(recipients: List<Recipient>)
+    fun setSelectedRecipients(recipients: List<RecipientChipItem>)
 
     fun showProgress(show: Boolean)
 
@@ -38,5 +41,9 @@ interface SendMessageView : BaseView {
 
     fun showSoftInput(show: Boolean)
 
+    fun hideDropdownList()
+
+    fun scrollToRecipients()
+
     fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index 8b50a1c86..e21b4d16a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -20,6 +19,7 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_more.*
 import javax.inject.Inject
@@ -39,60 +39,26 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     override val titleStringId: Int
         get() = R.string.more_title
 
-
     override val messagesRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.message_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_messages_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.message_title) to getCompatDrawable(R.drawable.ic_more_messages) }
 
     override val homeworkRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.homework_title) to ContextCompat.getDrawable(this, R.drawable.ic_menu_main_homework_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.homework_title) to getCompatDrawable(R.drawable.ic_more_homework) }
 
     override val noteRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.note_title) to ContextCompat.getDrawable(this, R.drawable.ic_menu_main_note_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.note_title) to getCompatDrawable(R.drawable.ic_more_note) }
 
     override val luckyNumberRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.lucky_number_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_lucky_number_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) }
 
     override val mobileDevicesRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.mobile_devices_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_menu_main_mobile_devices_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
 
     override val settingsRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.settings_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_settings_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
 
     override val aboutRes: Pair<String, Drawable?>?
-        get() {
-            return context?.run {
-                getString(R.string.about_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_all_about_24dp)
-            }
-        }
+        get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_more, container, false)
@@ -104,7 +70,7 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     }
 
     override fun initView() {
-        moreAdapter.run { setOnItemClickListener { presenter.onItemSelected(it) } }
+        moreAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
 
         moreRecycler.apply {
             layoutManager = SmoothScrollLinearLayoutManager(context)
@@ -148,8 +114,8 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         (activity as? MainActivity)?.pushView(AboutFragment.newInstance())
     }
 
-    override fun popView() {
-        (activity as? MainActivity)?.popView()
+    override fun popView(depth: Int) {
+        (activity as? MainActivity)?.popView(depth)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index f9fd5bbf9..893677255 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -22,25 +22,24 @@ class MorePresenter @Inject constructor(
     }
 
     fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is MoreItem) {
-            Timber.i("Select more item \"${item.title}\"")
-            view?.run {
-                when (item.title) {
-                    messagesRes?.first -> openMessagesView()
-                    homeworkRes?.first -> openHomeworkView()
-                    noteRes?.first -> openNoteView()
-                    luckyNumberRes?.first -> openLuckyNumberView()
-                    mobileDevicesRes?.first -> openMobileDevicesView()
-                    settingsRes?.first -> openSettingsView()
-                    aboutRes?.first -> openAboutView()
-                }
+        if (item !is MoreItem) return
+        Timber.i("Select more item \"${item.title}\"")
+        view?.run {
+            when (item.title) {
+                messagesRes?.first -> openMessagesView()
+                homeworkRes?.first -> openHomeworkView()
+                noteRes?.first -> openNoteView()
+                luckyNumberRes?.first -> openLuckyNumberView()
+                mobileDevicesRes?.first -> openMobileDevicesView()
+                settingsRes?.first -> openSettingsView()
+                aboutRes?.first -> openAboutView()
             }
         }
     }
 
     fun onViewReselected() {
         Timber.i("More view is reselected")
-        view?.popView()
+        view?.popView(2)
     }
 
     private fun loadData() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index 9c1abb903..e82c75545 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -27,7 +27,7 @@ interface MoreView : BaseView {
 
     fun openAboutView()
 
-    fun popView()
+    fun popView(depth: Int)
 
     fun openMessagesView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 60de9920e..cb172b98b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -3,7 +3,8 @@ package io.github.wulkanowy.ui.modules.settings
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import com.takisoft.preferencex.PreferenceFragmentCompat
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
 import dagger.android.support.AndroidSupportInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -24,8 +25,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
         fun newInstance() = SettingsFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.settings_title
+    override val titleStringId get() = R.string.settings_title
 
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
@@ -37,9 +37,9 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
         presenter.onAttachView(this)
     }
 
-    override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.scheme_preferences)
-        findPreference(getString(R.string.pref_key_notification_debug)).isVisible = appInfo.isDebug
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.scheme_preferences, rootKey)
+        findPreference<Preference>(getString(R.string.pref_key_notification_debug))?.isVisible = appInfo.isDebug
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
@@ -51,7 +51,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
     }
 
     override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
-        findPreference(serviceEnablesKey).run {
+        findPreference<Preference>(serviceEnablesKey)?.apply {
             summary = if (isHolidays) getString(R.string.pref_services_suspended) else ""
             isEnabled = !isHolidays
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 3c3d4990c..88d38e0d2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -31,12 +31,14 @@ class SettingsPresenter @Inject constructor(
 
     fun onSharedPreferenceChanged(key: String) {
         Timber.i("Change settings $key")
-        preferencesRepository.apply {
+
+        with(preferencesRepository) {
             when (key) {
                 serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
                 servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
                 isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
                 appThemeKey -> view?.recreateView()
+                else -> Unit
             }
         }
         analytics.logEvent("setting_changed", "name" to key)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index baf347aed..54439e0ac 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -75,7 +75,7 @@ class TimetablePresenter @Inject constructor(
 
     fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is TimetableItem) {
-            Timber.i("Select exam item ${item.lesson.id}")
+            Timber.i("Select timetable item ${item.lesson.id}")
             view?.showTimetableDialog(item.lesson)
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
index f56652d5a..b1db1bb82 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -13,6 +12,7 @@ import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable_completed.*
 import javax.inject.Inject
@@ -84,7 +84,7 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     override fun showFeatureDisabled() {
         context?.let {
             completedLessonsInfo.text = getString(R.string.error_feature_disabled)
-            completedLessonsInfoImage.setImageDrawable(ContextCompat.getDrawable(it, R.drawable.ic_all_close_circle_24dp))
+            completedLessonsInfoImage.setImageDrawable(it.getCompatDrawable(R.drawable.ic_all_close_circle))
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index a462ca7b5..add05895e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -20,7 +20,7 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
@@ -130,8 +130,8 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                     putExtra(EXTRA_FROM_PROVIDER, true)
                 }, FLAG_UPDATE_CURRENT))
             setPendingIntentTemplate(R.id.timetableWidgetList,
-                PendingIntent.getActivity(context, MenuView.TIMETABLE.id,
-                    MainActivity.getStartIntent(context, MenuView.TIMETABLE, true), FLAG_UPDATE_CURRENT))
+                PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
+                    MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
         }.also {
             sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
             appWidgetManager.apply {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
new file mode 100644
index 000000000..7afd6e781
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import androidx.annotation.RequiresApi
+import androidx.core.view.ViewCompat
+import com.google.android.material.shape.MaterialShapeDrawable
+
+class MaterialLinearLayout : LinearLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attr: AttributeSet) : super(context, attr)
+
+    constructor(context: Context, attr: AttributeSet, defStyleAttr: Int) : super(context, attr, defStyleAttr)
+
+    init {
+        val drawable = MaterialShapeDrawable.createWithElevationOverlay(context, ViewCompat.getElevation(this))
+        ViewCompat.setBackground(this, drawable)
+    }
+
+    @RequiresApi(LOLLIPOP)
+    override fun setElevation(elevation: Float) {
+        super.setElevation(elevation)
+        if (background is MaterialShapeDrawable) {
+            (background as MaterialShapeDrawable).elevation = elevation
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index c367ecd07..a941c6fa6 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -2,9 +2,11 @@ package io.github.wulkanowy.utils
 
 import android.content.Context
 import android.content.Intent
+import android.util.DisplayMetrics.DENSITY_DEFAULT
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 
 @ColorInt
@@ -20,9 +22,13 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
 @ColorInt
 fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
 
+fun Context.getCompatDrawable(@DrawableRes drawableRes: Int) = ContextCompat.getDrawable(this, drawableRes)
+
 fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) {
     Intent.parseUri(uri, 0).let {
         if (it.resolveActivity(packageManager) != null) startActivity(it)
         else onActivityNotFound(uri)
     }
 }
+
+fun Context.dpToPx(dp: Float) = dp * resources.displayMetrics.densityDpi / DENSITY_DEFAULT
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
index dcf477548..9cec331f8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
@@ -2,19 +2,20 @@ package io.github.wulkanowy.utils
 
 import androidx.fragment.app.Fragment
 import com.ncapdevi.fragnav.FragNavController
+import io.github.wulkanowy.ui.modules.main.MainView
 
-inline fun FragNavController.setOnViewChangeListener(crossinline listener: (fragment: Fragment?) -> Unit) {
+inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?) -> Unit) {
     transactionListener = object : FragNavController.TransactionListener {
         override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {
-            listener(fragment)
+            listener(fragment?.toSection())
         }
 
         override fun onTabTransaction(fragment: Fragment?, index: Int) {
-            listener(fragment)
+            listener(fragment?.toSection())
         }
     }
 }
 
-fun FragNavController.safelyPopFragment() {
-    if (!isRootFragment) popFragment()
+fun FragNavController.safelyPopFragments(depth: Int) {
+    if (!isRootFragment) popFragments(depth)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
new file mode 100644
index 000000000..1fc3185c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.utils
+
+import androidx.fragment.app.Fragment
+import io.github.wulkanowy.ui.modules.about.AboutFragment
+import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.exam.ExamFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.more.MoreFragment
+import io.github.wulkanowy.ui.modules.note.NoteFragment
+import io.github.wulkanowy.ui.modules.settings.SettingsFragment
+import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+
+fun Fragment.toSection(): MainView.Section? {
+    return when (this) {
+        is GradeFragment -> MainView.Section.GRADE
+        is AttendanceFragment -> MainView.Section.ATTENDANCE
+        is ExamFragment -> MainView.Section.EXAM
+        is TimetableFragment -> MainView.Section.TIMETABLE
+        is MoreFragment -> MainView.Section.MORE
+        is MessageFragment -> MainView.Section.MESSAGE
+        is HomeworkFragment -> MainView.Section.HOMEWORK
+        is NoteFragment -> MainView.Section.NOTE
+        is LuckyNumberFragment -> MainView.Section.LUCKY_NUMBER
+        is SettingsFragment -> MainView.Section.SETTINGS
+        is AboutFragment -> MainView.Section.ABOUT
+        else -> null
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt
deleted file mode 100644
index d21b998bb..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/LibsBuiderExtension.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.view.View
-import com.mikepenz.aboutlibraries.Libs
-import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.aboutlibraries.LibsConfiguration
-
-inline fun LibsBuilder.withOnExtraListener(crossinline listener: (Libs.SpecialButton?) -> Unit): LibsBuilder {
-    withListener(object : LibsConfiguration.LibsListenerImpl() {
-        override fun onExtraClicked(v: View?, specialButton: Libs.SpecialButton?): Boolean {
-            listener(specialButton)
-            return true
-        }
-    })
-    return this
-}
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
new file mode 100644
index 000000000..2774dd5dd
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <group
+        android:translateX="1.1304348"
+        android:translateY="1.1304348">
+        <path
+            android:fillColor="#FFF"
+            android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2 2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
new file mode 100644
index 000000000..4699c4576
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956">
+    <group
+        android:translateX="1.0434783"
+        android:translateY="1.0434783">
+        <path
+            android:fillColor="#FFF"
+            android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2, 9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83, 12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22, 8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
new file mode 100644
index 000000000..cb42d7cc2
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956">
+    <group
+        android:translateX="1.0434783"
+        android:translateY="1.0434783">
+        <path
+            android:fillColor="#FFF"
+            android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
new file mode 100644
index 000000000..d6b0d4d17
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956">
+    <group
+        android:translateX="1.0434783"
+        android:translateY="1.0434783">
+        <path
+            android:fillColor="#FFF"
+            android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11 4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
deleted file mode 100644
index 00538168f..000000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="26.086956"
-    android:viewportHeight="26.086956"
-    android:tint="#FFFFFF">
-    <group
-        android:translateX="1.0434783"
-        android:translateY="1.0434783">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_grade.png b/app/src/main/res/drawable-hdpi/ic_stat_grade.png
new file mode 100644
index 0000000000000000000000000000000000000000..d97efb5d404e74e92748f8ccca5b89643e14edb6
GIT binary patch
literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003qNkl<Zc-muN
z7zI=S|NsA&1Y!p&VKX3Rqr@?3K>X`Jb-^_tmLSJ5JV5;8KW)H7avY?OWI!{OqU;vb
zyj|ot$PmdvQB+Eg=b+~8A*4_U$rl2oI0z^wiX$}GC~=SnlI2dsI0z`l1jGyQq!S5x
zJ1Cq$!lk=|I*{b!v0zSmJE$8bNsB~Hk%NFh0gA;3i-V8>sH`y_Ob!Bpn*;5jdMMtB
zBqluIi5kc(9>{Dz=p0mtCk=sG39R&X5U37&hQmP}bWhYsjw(b-)FA9TAmtFPn;%2M
zK{7~UuYmYI74T1}dCN(55LA2%4cgOxk?kPWL2N)=0L1gDgeL*9H8F9E)j<Q<860#D
zvOsds1t8u}MO;megV>-wN?L#=<c5+s5cg9#bjS;#Q7{UI3jhH7*vM-Q!Tu8f0000<
KMNUMnLSTZz;f`DY

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_message.png b/app/src/main/res/drawable-hdpi/ic_stat_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce0fdabcb1797de4651d515649b0a78ed334eec5
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB4tu&dhE&{2PLN<-+`#tW|NsAu
z4tqE|zF+2OKEtPS&9LtOOLnHt!V7LzRvFxed{&O`>~ke2@mY1cK91H>d9wXV$%Qhl
zCwJZ+zU8>RamPHTn%T4Xez6_-u6g9X+hu{ZG9_Hy$Gjb6{1x}P__Fh69IVLFaJjjl
zSU_W;bwGzd-)j?-1$<V%?(DMCIef3=efXG6Sy)e&23U(0Ng7>aPfANV&0WHNmA_>E
zn=cCrd1f`U-7^dTy1=Bbv2?LJyRh5A05*oD|1uVMzI<B%^bUiktDnm{r-UW|d%|6l

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_note.png b/app/src/main/res/drawable-hdpi/ic_stat_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..7318c4195cf58a960f1a2b988c4d434eb0c358d7
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003ZNkl<Zc-rlk
zF%E(-6ozqNfG{vHFnJMnxdcQmVLXH;ZYEA#z}1<R0cQs<z{W(-#rm2&lg2=7DHM(U
zlP@8qeS9GW9)_W#GjIqY2Ow)<4|qN5dAPQ%=7Fa`LArAR903^z*L0<j6{3j*grX0%
zgoJ8lEF|&?nR>Mr(n4BD3;mK%j+5`e64?$Qv}NkuaV+N%+7Wfx@d&xVS%D0_hRgd=
zG=T+kiz$`F#jCekw6-bRC#4cX=@^Y$06cog&^5tW-Q=c+&}Pi`b_T40hC`&mxib}g
zw-2m<6Hqb|C63W^{!~8&2_uwz!(Ynx2!Viw`{WgRY)v6D2adq4Wi#LK++3B64O}^%
tGCIdrAruR|gJM;iIOAmcr%vbZ@&spdrKq!cZ@~Zn002ovPDHLkV1ky)kB<NV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png
deleted file mode 100644
index ea5b85c82b21fada50a40ded37b0d1ad6ee022bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003{Nkl<Zc-muN
z7zM)-{Qv)-6^LVjcs3Bvry_0#VpUQd!vw_rK>YVVZNPJq90gP?4#Xe+(-yRo;vfYi
zjjN%2YG4~AbLW%mp!rlxmxRp)N{Ar&fQ1wXK@+|Vj?myC*Fp1<6e$p^5hyMJ#9M&)
z2aYt7KyL@lCXi_9?x5RH`Oi4Y8yk8%=sr~bKD86|uyYV{l+6R;G9cz3NC#m9M}e4Q
zFgXYW+y}}*kC6()5+r@`1D>csWzRsCLxV1ajt{mp6b8iKaX97(-E$dKodXb0Mk|L(
z2c#ULWqW8yI7kkN|3JlVQ?bXf8p*ENq&SERh%eBvfe-4<L=){GsJJQAQGclHnD;>3
z3u^w7<RGMwlA~g;Ljl^wV#Jrwa5`w9y3EK9vY~Qlp!8;lbx`|%+5-hr9Ha{EYYz?w
nAvvm@%A*{}SY&iOi4p(+54K;OL-!A_00000NkvXXu0mjfoqD3*

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_message.png
deleted file mode 100644
index 86d63c587d3a6a3678548b9a5ff894fa5db5a00a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0002iNkl<Zc-rmQ
zF%E(-7>42MqMK39;qE}1E?hzvkH8V^gty=#M&sth5ga)I#xT{-guxIKz`rd`?U%eO
zd4>W3#=^o3O)0fPG2#Y#UpE?p*`i9B-2?6VV3rmzpQxw{v{7~!cY(NN5cdX@B0(tC
z4HCr1h|mp6(2P)`8&snwp;|X6LwiD*_h-mCP>Jq@O5LCw9SG&&4A}-1=uD{a{^j~N
zptVb&E1Lcax}l4vPUwgheQwWhAUWpuSQ{kK#1+uEm=;Jf7uJB>z%-zF__Gl<U@xWg
V_2$Wjx(xsT002ovPDHLkV1nk;bcX-{

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_note.png
deleted file mode 100644
index b49e4ad2c6e78ea1ae6fd061fbb61a041c2bc9c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0004HNkl<Zc-rll
zPfEi;6o>m~UF^c(st4!=B+^B@wr)Ix3vUth5bkv)D2Tex(lZp)?At{v(pDGE_#5~M
zkCK{9Go7l;gO8Ax%$qL|CT~)y`0!yllu}L5%b)}HK-I8bmE$@q>NfKV=$o=)25vyx
zP^b-VIX)|T>k8>ufICB>dyZ2!gklhpgt-rqE5awoB_bEED-?-*tja|!YDHei3wa?g
z^p}J}@Wz|RTwyiyl0tJ)Ys{RUC(IKHz;({|$3`qTPf(;?Xn_kb5KlEKDKHYX2CUyQ
zZD*wDQAwe`?Zzz-UwqSe1-rI|YTyJ+3}q%9SKCy3du}Ln26i^xclX(rzJPa-a`Ket
z&un)OU2X;%U>_WVA%%uK*ZIaacPig6d-7YhPTLj2#C0xer{D@qDWs2=%<JoQS3(Ei
zNxaO<k@9-zO6c(i87cMPN@!Ma4Vt<V>aN(QFVppZOa6U)0iq}hKL}x9BLDyZ07*qo
IM6N<$f>zD72LJ#7

diff --git a/app/src/main/res/drawable-mdpi/ic_stat_grade.png b/app/src/main/res/drawable-mdpi/ic_stat_grade.png
new file mode 100644
index 0000000000000000000000000000000000000000..c85b2702cc45c50aed947e0d07e083e898b6f357
GIT binary patch
literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002=Nkl<Zc-muN
z7%1@n|9@#9b|3*;0x=)4hNl4W-~Xh8w?M2$j0H!4_%jgKlYnPIEh#6)f>S{JoWvkC
zg<4RHO;QDj_XBYvE(?HsNg!ScRR_a9#9Ckom2AXg!Az){`$#yFnigyVDIhn9h_(O-
z;-OfbRu;g(4<Oc{g$1BYRS9J$(<BZ+sRyb)m6{ez#FBGesA+*9)Dlqo-wwouRE=ax
zb27RG2Z8t-5YHz8Z-$ytLW~8$K>VGI(iD`tWeHjU72^P61ro3vzVI`ETCkABN(P46
z2t^PN5Wo3PK9C?L6{rJo1&Ngm4D&FI0&)QW|Bm&F`HtNc00000NkvXXu0mjf<|J`U

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_message.png b/app/src/main/res/drawable-mdpi/ic_stat_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..b357b32105376c5820a91c084b15572943fdeaa9
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gji#=T&Ln>}1CrE@n`2YWZkHZ@7
zBYY`I6XM)z+VcPUTi#$h;&VeM;J3f+g2uB<&RS6kK0U0}jXUOf?3pgZy~@KwCiF=}
zfmp|L;m-4uk`LwxO?sY_q+_tCRA6EB2fmK?!kzbdz2r-nH!@A!F<XXv#k`9vG8-9n
zbu0Le#N5y^a0|AW-?E6QO}imNFx<;w+k$ywQ+o~1^0;qWFmKvbRqn$Y2bdTn7W*Uw
Tr5v6EbS{IZtDnm{r-UW|=h{-!

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_stat_note.png b/app/src/main/res/drawable-mdpi/ic_stat_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..55a4fbbf4a30c13fc757697a29d2c71f7b3d57f7
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj_dQ)4Ln>}1CrFq*`2YXEjl-LU
z7T(4g6FF*o0=Ay0s@$My@~@w>jM-3I?r`M7tP72XcHHk6KGrDg<9NEAsnCY+4p(Tg
z;Hu|*hGIHxpQ8T>^G7YH66=pLIHWs)<&nL^AIXmQ%pa?TbSn6-ewNH?Q(4zDnd^x8
z!mjv92?xDb$W6ExlGM#7Dx?#jxV<LIyX9fFrX~YxV}-EXVaKATD;k-(jXMN8_B$79
z3e3K|$fKV3&=!LTi4Nz+AKD_#Hx6AfiV^R)pTJo^VTPWm&Wu*|N$G)ynR2(h5|GR`
c=BZ|2Xy>@}NpwkFJkYBQp00i_>zopr09K}Iu>b%7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png
deleted file mode 100644
index 64fd285d6ecc84cc1ee3744647f55441d0658f6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002;Nkl<Zc-muN
z7%1@n|9@5>79|4<0x=^Y!$FFU1M$EAq=O$o+>X~0pkxA6@hu?UPa=K~wL}n~1zAuF
zvd9S9{ZPH4$by_uLj&+x0OYd+aRgKzhV6*4KolytpMV7mv4r_lYFh9Dh(FWP2d_Yw
zoH!uGf?r4}rWc60sBHl{D516mZ=mV}Xc5UYx8NkLgGdXA*C0i54^<<XlA;3Lf($5s
z1zM&e2H%2~!Xo%A&<5hK|H%i(fS3iR1xS`;kl}-PAQnImHw+7?T|EjyD~b1HR4_0c
xfX@O(Xf^kPf^g3w<O@cqPejSYoCDH20RZZ4pZEVThl2nB002ovPDHLkV1f}LbRGZz

diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_message.png
deleted file mode 100644
index 73a1653a0ee6d53be7f126797c79634f1f0fa439..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjb3I)gLn>}1CrE@n`2YWZkHZ?4
zBT*?y6XM)z+SdQ{w~Xk%Dzsq1q54;hsySjAK^K{Hfz(3HTl`0OT^{{?5^=%7=~0Hl
z@g{ADJ(E0YT4lJOF>hp^Sn+QG&mw(?Ka)KEqz3#-;No;WB2uKYpwewIOU8vuO~)P1
zIQFn|duV7S?2zerTDX)Yg<C2!@MgxvGX+Z??V334sw($kjRQ;!or&HXw!NNz8|Y95
MPgg&ebxsLQ01iP_VgLXD

diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_note.png
deleted file mode 100644
index 3498f71c386298ecad4c6301e495f436142bad0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002>Nkl<Zc-muN
z7&hSl|Nrbjtc`><fS8L2eOyqr$a>kaDFjI%gWo{B8i;xE7|sV(^BYaCHa-g;1Mw;#
zz6#aY48);0a5GfRRj8iF#8|Kj%5V5jJZOOGSv6|G2)95Hh~ES84<LR8#9v6T;0sjG
z52zW6*eqZK;zS_616BN<1Pk6n_1uA)!AMNep@}7jVgn#G8swBsEJ$IB53B^KCAR>S
z2IBQNeDWJACrxQ7%L&9bKwJ&PU!k}PD#l6eA{`Wwuc&P(BQyyo1Mz1lPKJsxQo{mJ
zP&~yF2Ou$PYFID}PYRkv4GUz@szYQf!!Yat0L!)M#bACOZvX%Q07*qoM6N<$f)AW@
AFaQ7m

diff --git a/app/src/main/res/drawable-night/ic_account_circular_border.xml b/app/src/main/res/drawable-night/ic_account_circular_border.xml
new file mode 100644
index 000000000..a6a9e2536
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_account_circular_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="3dp"
+        android:color="@color/colorPrimaryLight" />
+</shape>
diff --git a/app/src/main/res/drawable-night/ic_all_divider.xml b/app/src/main/res/drawable-night/ic_all_divider.xml
index ca44eb29e..cd444a285 100644
--- a/app/src/main/res/drawable-night/ic_all_divider.xml
+++ b/app/src/main/res/drawable-night/ic_all_divider.xml
@@ -5,5 +5,5 @@
         android:angle="270"
         android:centerColor="@android:color/transparent"
         android:centerX="0.01"
-        android:startColor="#494949" />
+        android:startColor="@color/colorDividerInverse" />
 </shape>
diff --git a/app/src/main/res/drawable-v23/layer_splash_background.xml b/app/src/main/res/drawable-v23/layer_splash_background.xml
index 5fa58e900..1b4b64ec9 100644
--- a/app/src/main/res/drawable-v23/layer_splash_background.xml
+++ b/app/src/main/res/drawable-v23/layer_splash_background.xml
@@ -1,12 +1,12 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="#9a0007" />
+            <solid android:color="@color/colorPrimaryDark" />
         </shape>
     </item>
     <item
         android:width="200dp"
         android:height="200dp"
-        android:gravity="center"
-        android:drawable="@drawable/img_splash_logo" />
+        android:drawable="@drawable/img_splash_logo"
+        android:gravity="center" />
 </layer-list>
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_grade.png b/app/src/main/res/drawable-xhdpi/ic_stat_grade.png
new file mode 100644
index 0000000000000000000000000000000000000000..c55ca7fdd184fb3fd066f299dd1032c2215bade8
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004UNkl<Zc-muN
z7zLw%zTp4={}MnP2*mL;#IZnZNDIfO0P(l~^aERgn44OT*8}3;|LG6<spWy{{{sUa
zQp*EVkqkXY<9wEhWY_Oe4-6R(02SK;@q8rAM6L%w#UM1_%*TQ2XyJiGv<$>Tjt7A9
z8AOy=rv{}5fO676{GEu>Wzc#c6wQqNIPmnr>VZ^b1L&QJM?Em?Jb;$&_X2Sb5Q`2a
z4`2gN@p)n>cmM=?hl&S~Yu}ql;s=LZCI)h64uy(r)B^+U0dFER@y5aG0RbR>MT7?u
z2Xk}UnSdvz05RjB^#D{o9}xSZjrT+WvBscoN(^+Da#(v{3X=FOAa<Z3?nkog7qvW4
zG(ZDe*Qw<J86f^J03Il&iU*+b_CS1}P7ePC#BIn!I~02WNu45%^MElBvy+qiiSoc;
zp1c_H9*9NrKoX5-Vvw;AH9TPSf8c;2wPIo0Q1<{gv?hEwBt0++M!_f;1*3oz001<f
V)FlCVMTY<Y002ovPDHLkV1jr~u#Er!

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_message.png b/app/src/main/res/drawable-xhdpi/ic_stat_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e67ade37c96d5005b3bb5dab7164092772d0ef0
GIT binary patch
literal 289
zcmV++0p9+JP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0002!Nkl<Zc-rmR
zyA8rH7zE%nkOde5!2}er2t@=Yb3|;yP(X_qB1KZf{FYK69+r&o<E%UBTIc_yIEkF1
zU>GLfXst`>T3SV_xpw*M@C)fh$In%|bRB*oJ?nI05K|YxN~f2N3!q96pj-gE1OYVx
zxd2*^@12%_aiM+AfX?HmLl*)7v59SfUfOtS&pkjuA^>GsXpr7KbqE1~cnYbUZy^F=
z10X&n;5YGs00Q2!MF-500VmhzaVmhj^k|Mc{|RUij@4_};Vl4+;lBWIhW`M-8vX@<
nH~bR-bNCT3<1bEzVS?lV4_~TY^3y5_00000NkvXXu0mjf*wS(*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_note.png b/app/src/main/res/drawable-xhdpi/ic_stat_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea674a793e0537bc04137d833abd3a504ca62171
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004qNkl<Zc-rlm
zv1$TA6h*ZYYqbs*LTnW5tWpHFiHISsr1AqSto;~^<PWSQ;3tG&VG%7N*w{ouKmwEd
zV2WXiU1n#-8IyP6fb8tNcW>kFye$-1EY{zX5TXGdQ@8~shy6;jW?IjNNx_lG)*7@O
zm~YEkSsJ+xK>7ex3-eW3Lxc)I8e0Sy8}zXXFabA`L|fZ|mz?ahT8YwU;xa&@td)g7
zm6bjT2jBo4fCF#<4!{98K%f8vZSx*%BwLRGwo0G9wl**cPywGJ9+8)d>AU(6{6t`$
zJPh+5IJ)3j9{Dy3M-N7iT938t-Su(kpLz%|J?GS-<sm@p+@qI;L-UIev!f>Xa$ufn
zG(!!*df?l_Jnij;p5k@DYYy|YrxVL4vIy?M6F8)pKFE9M-eSzN)f#wLjMMMhr45Kz
zN`TcRPPjQh2-AHq18?A@1USiSwAPQ&IK6%^4gNxx#;?bo1I%+g2j;PuzqWW1U&RpM
r!6Lw23<2sHALr7j^Cwjn>!0fv9|XsrB9~cA00000NkvXXu0mjf+JeIi

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png
deleted file mode 100644
index 83b2c443a246c9eced174907376e1ba6be01ab8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004;Nkl<Zc-rln
zJx;?g7>0{7bs$66X3GG?S752Q0&s|O047jI7^%d@2@qS^%K@lBK$sZI(ur;eRhZY(
zSIM$~5WdJil3(eWnkIf^=c|9(>BPj?kCd_pHi57}0Wy%Z(eO2}4=V5>?c@`@f>V%k
z1$Mwfy2%opuzCVtzLIV;1AUIbqjs}7C@nBChEu^2sI;3^mI_8`^n!>2-U{HuoEo`e
z$Pu9WJpxnXz9xBF0>Zes{I38t{`rs9MffN%YET}%6qst)zK1x3T6y84Kot0X+Hp*?
z+B6h_pK=ejLKaZD2HlVa79o_;7h{=tZak+5stPq}R1{zcJcT}lZbE;F4`?T$E@NNI
zXct`6H2zL)ka_t-M%O1`8yp%_i6gKF*1erdxLOlO0pA6hEEC&eu02z2C~t5C&K&QJ
zs;$i)M<8o3%WOMuV7G3({VJeIsGhjBG=v_&B^apl3ATXmM@Lb>wLn3K2&+si9b)JV
zIRY6SsJTqV5lHAXa2cckNu(q(Glo+b0$NY>>75Xk$>U!MVl3thufz|69<s?w00000
LNkvXXu0mjfk%h!F

diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png
deleted file mode 100644
index b373ffd4a3da4fdfd71178544e8de3e4eaad1a05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0002fNkl<Zc-rlm
zu?@m75Jinb%?Kbypve|c*wfG<&%jWKlq|p?h~pQoP>^th!QcEZy)IJjIk}6IIHxE|
zyD_s4^uUAgWqdk!H?{aBINR?tfYp?hKUqB)vaSRU-dKI<a|E^(3iup>P@zDOKr;db
zpF0xx4}pT)2Q~4#0*6AV2PD8Ug)W8A6jBdJKwAmD&`6+JfgQ8J4Xl|3j=A%=27x=c
zf<2gjQXn#XRu3;$B!U^E08jBF0$jz92yhkuBoG~A(*G&W;*-FF?zT}Bg)<N4j<Jp*
SmJKKX0000<MNUMnLSTYe;c3$V

diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png
deleted file mode 100644
index 5aa30e5f7d3972f4b2def8b44827af3dd84bd8ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005;Nkl<Zc-rlm
zPfG$p7{<jvNz^6isELQDTS4uiV?j_5VFwH9Q$%0Eqj<MVohribP|=}dUc9K)!HWnL
zAy_H3Juke$u!qHQXVz8bf!}3z_MPWpM|Wm66f!b08b8^#od8)EcEAD%D;O&b7P+R|
zm<gGpbc37TK?!VvhzIi#u2JHeZpx|*K<a@Tu;L-WD!AoZw%-9rA0X!;K#ptJx&ss(
z^YLFl;2B&G$P4%tO$roL2FN<DYmtlx6Tk#80ZafBzyvS>OaP4mGT>9VxdAEyx+IR#
z5ZcL0Mkas-9_-+VyjU^;qTq;^yS*VA@39B+5|!O-#CW@R1<H=c+tOgR<rt&PW0QxN
z>P`QNh5*NYo?0yTu?d$E)mrj1z%)2l7~qU*`Wb+ZL)LhndetM>3Wxj@2Al*3Y`}~8
zeX2FA6TB&~4KBf(gz;B!0k){du#X`pKnm=FJh%f*K5`L{Uz&U^&wW$M{~kRCq4&lN
zNP>A#69Uw@Ey;a?W85W>xMr%1;tBWY1%S~wnB}Qb6#`VbjjqLmXq@JM8XSTmxCb2}
zK!@9k+$SBF-vO^&EnaxF`}hlOb6-n(g{djP95@ACiT6O4pGGnW0XD$X0B_+sSPw#g
sJ@7q1fG@gt6g~*5`EX}sWHg@o1GL%fqh^eocmMzZ07*qoM6N<$f;hYGSO5S3

diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb6fa41b50d3965caaaee3152dfb583e2456422
GIT binary patch
literal 602
zcmV-g0;T<lP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0006ZNkl<Zc-rlo
zyGjE=6ow;S3WFdi)FPllv=D-5p`~{E1fq>%p%&VhB1A02!cG&g7aL!|#=^!2Py{P4
zg?1{Ug%{957|)UgLpZz1Zj#x#{6Bo%*`3YDW@mP0Cl*5x1VPM?5Tc7%CU%KKg(whf
zL^4V_OT?#8J3mA&3ORE^uViG(X(OIB6ZAzSWC@xSdS+IZpn0b8J7P;AE}3i0$`Z85
zG=8F3?|Q&o;|2sl5Co|!h)yt0ER-?YNI`U5KQY6!>qR0;LHo=}cN!sx>br^K5MA|%
z@q(zflei5zma#%mp@zYp*@CF9iFkn^?=})1Km4ppQl<;);q2(r%|j3bL6Dh(+&QLl
zQqJTY1o`KK$P;l0^3O#ONj3^{l7}GwyjS~7GEvY2!!J`eh;IJB_Q}R~F$jVn2!fy}
z1;uMzJ~n$k$UXi#q?}ix*#<!?Aq8z4Kawt)mp%$8=agu*LQsh$=T5q*AjTO{XNeXo
z-sU~pZ72E|I;@*8lNAVpAP6#A5cdi2TY%M389XxAxGqc3u%=(RPDv5u)}Cu7=RU|l
zvmS!d?i{fW`6edn@nEZ3kXt|G{@+!ObEl8h>&YKTP|0z<9xJ0!Gf?lYF_a){0znW2
zL5&u)#|XL-YHhXTNXrtms_6)MT9%-sDDLruARkFN2&yb8BZ_-GA;?FP^TD^X3ujZP
owbha%g)SCB5ClOG1VL2DAG(}hLxvp3x&QzG07*qoM6N<$f^JCuSO5S3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png
rename to app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_message.png b/app/src/main/res/drawable-xxhdpi/ic_stat_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e881824230b14b122c0e90cbda034b1b5218582
GIT binary patch
literal 361
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U^MV_aSW-r_4c+e-@yQpwuk3<
zTUsM}U6hnAiQZ^jIFav<bgA^*$PU?#BYZK-J=33PS^g?M|6A?;9Q7@E0<JDV@Wt?X
zjKA1vp~zdCRF5XV|IeMSw0rlr>Gtg_&CcCuy&l57TzfYw$CUk(s-p7O26US?Ok-qL
zm2!C9(CEj&$Rgk{t-<K#qGzeTY_rTC?6FucmBB3Fz`%G#NMZ8!$_9}}y-meucZcw9
zc`5}|%fKkYCQxo@$G(^8EyE>dqe@;T4uuAWEba*>^G(0qdBzClu39YW@Gniuq1~bI
zQ~bL!#;W_yW|w}wkdwL)YIeoub`A3svj;04M*r(??ECg`z0L)tO%a|7vn^B`-#ij=
za4)E1W;)Ky(#Osr!!KYVr%+(y@SviBO+!FXQ1Iq!&PTHzJ4tk>qymGG!PC{xWt~$(
F699nziH86H

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_note.png b/app/src/main/res/drawable-xxhdpi/ic_stat_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..174e1509b5b80104dd224958f8f5b9f8cd73a6b9
GIT binary patch
literal 590
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U=sCoaSW-r^>(&>Hj|-5yK={B
zkyj7G3QG$Mz6h6W<j}Q<++AA!>Vl`Z>yp-{;O%<1F8(~A{~%|2lis54OTJgW@Ggm7
z_v3ky;m7X>@^{VHQ)zLoyR(N8Xg&jj>YUF;Piv3w36#^E&h~20f;&NR-&SmwIdVXD
zpS|}f=Z>O0jnB-l-pmmC;%>@fc~$w9v0jGr$;>H}CnrZ}dtA7zv7$UB_ZG`q&HG(C
zqPfebX#39mW%EB|>)OL2Cf_q}KYEt=^NLx!0!I^WWTd}h?TZT6k0LYYG%V=!&((Il
zT_(_^bthKKk)um~M|S0_4$Gs>x9YXzb~=`4b?g*rzPCg>uuf)z^0R<TTPM$4ViWw!
zj^FA0hq>E+E?>8Ajcw+y9cL~qSg?@yd8ZT`t7(qF6hjS-<kKrn&Ns-MUzS`Qxz5ga
zA-7@JwQZYww+gUcosk=GQSg*IN6`@p!8GNNiYw_Gr9~FK*VrsO%cb#?=mLq0;f*_6
z_RN0w)cnq`1MC~se|H#7U&yJZQ9i}$>EulT9FZroOK+MTJSRHqkAq^y0R|RF0T#yz
zfrgo<OjDN#m`u8U>A9M!Yvt0O?-lG)r_V2m5mUaF=5O~qc=x7BwJtFtS9l6mUM%tT
zi#zOO`hL=ab!?8Y(^<}%aLn4drR#o{z?Rad+ZRaO|C@j7w_4lv9B{nZ{$V;j#r5N=
Rn_;^^d{0+Dmvv4FO#nA11j+ya

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png
deleted file mode 100644
index cba48ec20de74fbf6f41053c959fb89d677e9381..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0006vNkl<Zc-rlo
zO-=$q5QWhNYoaX01sp)P5W;W_iFZ(3L%0zTbq@y+!wLL}dIU@)A+*)83@+%2Jwp#u
z-R~uDLx!RAF<o8N(^V)y5ClPCNGVk$*T@ZWL~iHM5sy!gvzR5EGI>CLB!80EDxX^O
z_-5oj`8X>$WAakTk{<8KDI}g&1A%aU^~Fz8(G{Q?Pb<mN)2-$TP=n{RWG%>bSAZfz
zK<?&r73&%TcjO9C+wiZnbDD}|J6-?+AONx+FI`+R1h|rGK%8`*lUo*n_dIJr|Gvqt
z0MYe_4CS8uL0(xb(^IbjF`P^CYr;IndqAft-~<8aCS@k<J)kiF#sA)9%lGG4#Wwet
zrg<v%kp}?~00EHqfJ{NU#id9&bU-GpxD>e~H+2>cKxVy=J2sF)1Elp#t^iQHt^p`s
zBdlT@&$nDVK_0ZDoC$yc2!H@6<$h3*K|1Y@;?Q?M-IRc?d<RtFx+;mD$R{DZ7waT|
zr0cK??~Bzxkea-W@gDPLRe%0QzU9MP2i|XYSiYOrpPwZ?cqtx`YXJ}d0g!iq!aL<^
z2`IdC(w2bqN&A^_Ko8`qD?qweL-#sJ?$ziin_dmuK&F#6_0u)86bNTXK5`!E8B(98
z+d}2LUu?nCs%H%+%~Gf~9fx(5?~X$~zN$*v0wpcCk(o>Z5C8#C3?OOcgUKaVfP5$)
z+&%H0ln+h;NiQGV$4tTHLw1Xbpz=ZOZPgW0K4iO!K@bE%`Or5hl9M$RgvUSt0000<
KMNUMnLSTY4<_tXm

diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png
deleted file mode 100644
index dc15bbd96ef089b3e965c86595d589aa1f7fa859..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00044Nkl<Zc-rmT
zL2AN46o>Ixuy*AcdJHM;D!om2p*sl#1n=QJik?AG=t_^!jm1@cK1FwCl9pFyGV^`#
z-%9&Kld+^(MnptJM2(5aK$q(ZUD>e}m!Ey`UpP;?wRFGJ@9=DmGt%uOp1#eH^o8zq
zONp<w$;VA!<VE5ww*Y#J7^tuSdXE^Wv;Z0d<OV7M0tlc`fEK#S^A;fkRRMfotN;QC
zpk#rjx}oPyLk8OGzC3TwIjF<upzY-x;&WRr(%i)W0tg_0{sgqqeR$r6a}a+pix-G%
z5I_I{1W>?0bMgP6)STNq=OBOp0tlcafC_-z<p9;U(meolJJaW+V*~mW%O~xB2{aS`
z4^Y+Z^uHRfy1w<7zcxSz-9*>RQmX~fPqH{IfUY=qS*kgJz;OV9;{ZB<Qx61A15mnm
vs|KL+I|q&1Kx5uHZlFi5IYdN6MCo+|Z_QC$aFX2j00000NkvXXu0mjfVqUK;

diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png
deleted file mode 100644
index db3ec517bf5687e96351c7083cfe97189fcc64cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 801
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V0z){;uunK>+NiBkB~r#<Lh^A
zFk0c8I;C5Q!~9aRsI5WMEsmRhF<VNfyJ~OFsB*ly$u)4d(sUuIwOrg)Yq+W$p1N&W
z;Bb3Mui4Dy|F8dSnqa-?vE}!|AO9b2-(~!~=K1kE*3a+#RO^yxO9Y}BHzbm0IVLui
zG(Ucz5W$=!v|_#6bE_rA<@$^6rHQkiaNs^G@`ERDRfOiAQ;X+l&2@gZYiY5+?xK56
zmzw^acQ0Vn`L2<{x`U-nYmH&3qy2&8f-{R3_<djz`K;k##P!RTYZt$r?!tXnSbdud
z`<wQ?l({MV#BtebkyBUP97SAkqbZDzu?a?L9}Y^i87pM$@X0M!&VE&-xPp0)@k7^Z
zR~|YAaPN>_pb#0{&F#1~VfDuSQ^c4Bg0E~nF)J(9lzk1`+Xdo#bc=mYRjF<L78l#S
z=A>_N>qcLu(gnO<8XAqn4}~YFxN<5-ImhHOM^(>WcQiWqXpPeM25n8QT{@;IJEvzT
zTTEKC;BbQTG}g5&w|jFnX7~m4oKfu+y8YzK$tw3-Rv!-BIM%epC@*LE@mn@q-soP=
zo*1K(E<8cGcn{0&xiz`!3M-`6Fr^>Z%)(;Jy1ew<D-C_ejlU06ez>(*M)J4J4e6)4
zyUK56=I}pUvpm?lN}+torsah?uNihQ+F1yEmWyHky*Qxh=o<FjCEfbVW92LIa>`$^
z%;*#}TztIkOVqXH%Y%3Kh03>z-F;-<wD_1=O+54W0}(w73~klcTP}T{dFGGZ@yR=O
zutzluI)g)b%Bi&;!WpLD-g}3C^{dHq`x>!)-!{$g?Lwk;NAoWojbkZ4u((q0;lFB^
zUjlcoec$p*qEwM9>%#H5n_dL5TECe8pttX$z^pmCzdC0Y6s-OjYack<S*S#455s;L
z4y~8Dr#dIF=zgt_EfoLoZvsng>7T`md%miwI2J|yDbw&crq!zQVogxNk^3Ka98CkK
dypPlE|NZEWT>o|H3}Dh{@O1TaS?83{1OUtBXomm*

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png
deleted file mode 100644
index 3b40ad3f1740ed4d1bc4d421f250a58097d5a5ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4Udb;uunK>+Ky|FXljzhKnw5
zO?EJUPs~h|<UT2Nr?GWu0+(mD;*Hh`sXKVNxvwW^s!6_|kn#9@!-r=^RdzeJK9M`~
z*!D=A|0EU9Nh&L)LqknFB#-$dEi?RFZ*=)=`a1jH3dtX%4VN4CPkklZ^J?yvt$*sy
zRGvBX&OYi`%$6nr`zI>TuAbZPA~7}YU*4JK*#AFDO*A+Qa*p@%dNak`%1@p=iDCP<
z+c&nT9GLsp%uJutVDtT$hMj+z7!(*7t{67(*==P8`UV1i2!C%__xEXY_l#}{poq*N
zm;?iZjcY}h00To2hjj}hT(qLAK(JU)n1O+b!GVF{&-*-vCuM93>z~hHW~huk{)O>L
ziTvj9U#$WMo==;-_s#Z?F5C%sz0U-1{l~w{J$K*4|7;1O#_u#)7ySFWN2|(!@yE8K
zX+Lk9UAJp^s?M}WzyA2KTkISDxG<ddX8}?TOPS626H<TfWJsRAMuy=$cPGO<aUsUE
keV>aN`E=tU0l0ZDW8llJmn`P3umri%)78&qol`;+0NX;i&Hw-a

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png
deleted file mode 100644
index 06a9299a901e737f6b1d59fd490fb6ddeb3c36db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1238
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V43Ub;uunK>+M|M9FbI+W9(kM
zsu3Q}QF&dNmzd3*cnU5o=y>GIlhq;7C3DJA<u;qJ?TJQ-rcb^cF04Vix0Z-LUBLM<
z$-BYf$E7PD0+Svsbj;RWy720j!qcZepSMX}xFz<t;pWYo&rkl7xB2~^_y5h~cN>3R
z_gu4Ukp>L87@ymjb-}=muemnCv_j5?>64PdGMjIyoGTLK`TLXSTy-qF7G`j*q~ZPn
zz7J*^3_k@0CY;~5hSmD!@xH>I&5Em-CN1c1-p$n46q=Bw_KhX)=eBp-4{U#+_50fK
zeaHL`{C&wHexNF^cBYU4?;dWw#%N)aZEFM!CKxA}&zR20`1wFwL0QxBDWObtY^Dj0
zY%Dqq@eT1skq7qMywf}1(D3wu+HV1F#<iJx=i9pGe#mR~KOn8RnYUy!zq42oOVnbG
z1&U|WH)}awb!1X;ARQ%q=*o8Fe<7cAG`Z49@08@*$%TK{_~uSv%9`^(qw<nw^W>D=
ztR|5O45bUazt(BQuJKj!V4V6OcvhI4k9u~n<PwJJ*-Hgv*mYO^+`DCiTG;F+1=btZ
zp_dOjuG=tqcU;j7;o_Lf=MBp@vK@~UUVS!1|3!go>z${sZgkF*5xQ{L@cKr!u<n;}
z5fA4D94K~b3U}X{sdsnQ!LK@&b4->?dg~salfcX6bo0}3&9}_Y_fHW2`iAL!bs;y~
zSF07Lm>9Q(uJ2gfuskOrQsF^pfSfy{@xhvT?Eg9v9_BY>zj@4~-*@o9GmHOE-)PM1
zS^H!8+Wxqh!>6}ipJShRd@hIR{a>5rwx2j;!M$Op<UH2dN*WKGKlFUP*j;UKLj9oo
z0~eOA`z&V7JLA@|H0!cT&#_NEdw+pBbL;lfZO!>}?32A#PWL|8px(GNq5Jc5{$0YK
z6rUS?KP0|JKW<$s)2V~A&&^j_(>Z;)<G(AllV4}Bv>))2<16+*pdk75j&vQvb7qkO
zzMA)cem;Cwb;_3U=mXB@{_@-U?BCwvk6V7g^@DZ)_5VwD%FcRX^!88B*;A!LH7Cv1
zz773j7qsRSe{F=3SmX2q#~&2S8R`A+7cSGEzA?3)X@29{2d*0m7Sx7X?d?zsIOKf!
z^11oXKBa!(`rh@hsO$8NP3J#uewwq|W9nQ9%bAsG?h_d}10bp9&@VfK*6IEI*7eh(
zf9GwOai6ozTX}lqk@Ggk%$B|QRbRrS*6e=JXan0D#`tD=$J-oCw|1NfuVGr;lp7H}
zIrQe2*7>Yy*7ZT}zaJ1RIP>$f_3h18W?O5%b1?1N>0_K<E0-)Seb73mdYYE)o(3a3
z+mEkV?wjxP)4WzTQ|oWR!}OxpHV4*j(>^=R?pDd>v+obo%@a>s@kx_$bLI3ibwBrr
zJ~)4o`G0i6{yoz`qS-$@5_WTcdn=v&Ti=dxW7JfC&Kn0Nr%L4CyCIkMUwT6vP{87Z
z_lf^b0tv5wTz+Q^(p2WZ<8bTePw|t?bNN;R`Ck?HCnmpM75+4sX_dx8MU|Y`&{ca7
f<${LgwB0HDIb>44&7A`*uNXXC{an^LB{Ts5C%ic)

diff --git a/app/src/main/res/drawable/background_rounded_corner.xml b/app/src/main/res/drawable/backgorund_luckynumber_widget.xml
similarity index 81%
rename from app/src/main/res/drawable/background_rounded_corner.xml
rename to app/src/main/res/drawable/backgorund_luckynumber_widget.xml
index 116973b54..38cbde9b1 100644
--- a/app/src/main/res/drawable/background_rounded_corner.xml
+++ b/app/src/main/res/drawable/backgorund_luckynumber_widget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#ffffffff" />
+    <solid android:color="#FFF" />
     <corners android:radius="5dp" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_about_discord.xml b/app/src/main/res/drawable/ic_about_discord.xml
new file mode 100644
index 000000000..b019772fd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_discord.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="#FFF"
+        android:pathData="M19.95,5.67c-1.9,-1.53 -4.91,-1.79 -5.04,-1.8 -0.2,-0.02 -0.4,0.1 -0.48,0.28 0,0.01 -0.07,0.16 -0.14,0.4 1.26,0.21 2.8,0.64 4.2,1.5a0.48,0.48 0,0 1,-0.5 0.82C15.59,5.38 12.58,5.3 12,5.3s-3.59,0.08 -5.99,1.57a0.48,0.48 0,1 1,-0.5 -0.81c1.4,-0.87 2.94,-1.3 4.2,-1.51 -0.07,-0.24 -0.14,-0.39 -0.14,-0.4a0.47,0.47 0,0 0,-0.48 -0.28c-0.12,0.01 -3.14,0.27 -5.07,1.82C3.02,6.62 1,12.07 1,16.8c0,0.08 0.02,0.16 0.06,0.23 1.4,2.44 5.19,3.08 6.05,3.11h0.02c0.15,0 0.3,-0.07 0.38,-0.2l0.88,-1.2a9.33,9.33 0,0 1,-3.63 -1.7,0.48 0.48,0 0,1 0.63, -0.72c0.03,0.02 2.25,1.9 6.61,1.9 4.37,0 6.6,-1.88 6.61,-1.9a0.48,0.48 0,0 1,0.63 0.71,9.31 9.31,0 0,1 -3.63, 1.71l0.88,1.2c0.09,0.13 0.23,0.2 0.38,0.2h0.02c0.86,-0.03 4.66,-0.67 6.05,-3.11a0.49,0.49 0,0 0,0.06 -0.24c0, -4.7 -2.02,-10.16 -3.05,-11.1zM8.9,14.87c-0.92,0 -1.67,-0.86 -1.67,-1.91s0.75,-1.92 1.67,-1.92 1.67,0.86 1.67, 1.92 -0.74,1.91 -1.67,1.91zM15.12,14.87c-0.92,0 -1.67,-0.86 -1.67,-1.91s0.74,-1.92 1.67,-1.92c0.92,0 1.67,0.86 1.67,1.92s-0.75,1.91 -1.67,1.91z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_feedback.xml b/app/src/main/res/drawable/ic_about_feedback.xml
new file mode 100644
index 000000000..868bc4a5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_feedback.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="#FFF"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19, -3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14, 16h-4v-2h4v2zM14,12h-4v-2h4v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_homepage.xml b/app/src/main/res/drawable/ic_about_homepage.xml
new file mode 100644
index 000000000..33745f710
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_homepage.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="#FFF"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_licenses.xml b/app/src/main/res/drawable/ic_about_licenses.xml
new file mode 100644
index 000000000..1a052734c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_licenses.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="#FFF"
+        android:pathData="M12,3a3,3 0,0 0,-2.8 2H3v2h2l-3,7c-0.5,2 1,3 3.5,3s4,-1 3.5,-3L6,7h3.2c0.3,0.8 1,1.5 1.8,1.8V20H2v2h20v-2h-9V8.8A3,3 0,0 0,14.8 7H18L15,14c-0.5,2 1,3 3.5,3s4,-1 3.5,-3l-3,-7h2V5h-6.2A3, 3 0,0 0,12 3m0,2a1,1 0,0 1,1 1,1 1,0 0,1 -1,1 1,1 0,0 1,-1 -1,1 1,0 0,1 1,-1m-6.5,5.3L7,14H4l1.5,-3.8m13,0L20, 14h-3l1.5,-3.8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_privacy.xml b/app/src/main/res/drawable/ic_about_privacy.xml
new file mode 100644
index 000000000..3ea2f7957
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_privacy.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="#FFF"
+        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,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_about_24dp.xml b/app/src/main/res/drawable/ic_all_about.xml
similarity index 69%
rename from app/src/main/res/drawable/ic_all_about_24dp.xml
rename to app/src/main/res/drawable/ic_all_about.xml
index 550f312e8..3dfbbda19 100644
--- a/app/src/main/res/drawable/ic_all_about_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_about.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFF"
         android:pathData="M11,7h2v2h-2zM11,11h2v6h-2z" />
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFF"
         android:pathData="M12,2a10,10 0,1 0,0 20,10 10,0 0,0 0,-20zM12,20a8,8 0,1 1,0 -16,8 8,0 0,1 0,16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_account.xml b/app/src/main/res/drawable/ic_all_account.xml
new file mode 100644
index 000000000..6e7185460
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_account.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="#FFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_account_24dp.xml b/app/src/main/res/drawable/ic_all_account_24dp.xml
deleted file mode 100644
index dea10cb34..000000000
--- a/app/src/main/res/drawable/ic_all_account_24dp.xml
+++ /dev/null
@@ -1,11 +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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2
-            12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22
-            0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_all_add.xml b/app/src/main/res/drawable/ic_all_add.xml
new file mode 100644
index 000000000..e45662935
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_add.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="#FFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_add_24dp.xml b/app/src/main/res/drawable/ic_all_add_24dp.xml
deleted file mode 100644
index e3979cd7f..000000000
--- a/app/src/main/res/drawable/ic_all_add_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_all_close_circle_24dp.xml b/app/src/main/res/drawable/ic_all_close_circle.xml
similarity index 69%
rename from app/src/main/res/drawable/ic_all_close_circle_24dp.xml
rename to app/src/main/res/drawable/ic_all_close_circle.xml
index 3809c7979..3f89a8fa3 100644
--- a/app/src/main/res/drawable/ic_all_close_circle_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_close_circle.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" />
+        android:fillColor="#FFF"
+        android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59, 8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_divider.xml b/app/src/main/res/drawable/ic_all_divider.xml
index f46b3ad71..61e964979 100644
--- a/app/src/main/res/drawable/ic_all_divider.xml
+++ b/app/src/main/res/drawable/ic_all_divider.xml
@@ -5,5 +5,5 @@
         android:angle="270"
         android:centerColor="@android:color/transparent"
         android:centerX="0.01"
-        android:startColor="#60606060" />
+        android:startColor="@color/colorDivider" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_all_note_24dp.xml b/app/src/main/res/drawable/ic_all_mark.xml
similarity index 63%
rename from app/src/main/res/drawable/ic_all_note_24dp.xml
rename to app/src/main/res/drawable/ic_all_mark.xml
index 988df22c0..127216490 100644
--- a/app/src/main/res/drawable/ic_all_note_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_mark.xml
@@ -1,10 +1,9 @@
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#FFF"
         android:pathData="M11 5h2v11h-2V5m2 13v2h-2v-2h2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_all_round_note_24dp.xml b/app/src/main/res/drawable/ic_all_round_mark.xml
similarity index 51%
rename from app/src/main/res/drawable/ic_all_round_note_24dp.xml
rename to app/src/main/res/drawable/ic_all_round_mark.xml
index f4f1f2c52..91afb2334 100644
--- a/app/src/main/res/drawable/ic_all_round_note_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_round_mark.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@color/colorPrimary"
-        android:pathData="M13 13h-2V7h2m0 10h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10
-            0 0 0 10-10A10 10 0 0 0 12 2z" />
+        android:fillColor="#FFF"
+        android:pathData="M13 13h-2V7h2m0 10h-2v-2h2M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index cfec6390b..ee11f89d1 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,27 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="1926.9231"
-        android:viewportHeight="1926.9231">
-    <group android:translateX="462.46155"
-            android:translateY="462.46155">
-      <path
-          android:pathData="M-1001,-1002h3006v3006h-3006z"
-          android:fillColor="#D32F2F"/>
-      <path
-          android:pathData="M2003,1441.1V2003h-759.9l-1002,-1002h0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8c1.6,-3.1 3.4,-6 5,-9.1c0.4,-0.8 0.6,-1.6 0.6,-2.5c9.2,-15.1 20.2,-28.9 31.4,-42.6c0.1,-0.2 0.3,-0.3 0.4,-0.5c5.1,-6.3 10.3,-12.6 15.3,-18.9c1,-1.2 1.9,-2.4 2.9,-3.7c0.2,-0.2 0.3,-0.4 0.5,-0.6c7.6,-9.7 14.8,-19.7 21.2,-30.2c1,-1.7 2,-3.4 2.9,-5.1c0.1,-0.2 0.2,-0.3 0.3,-0.5c6.2,-11.4 11.3,-23.3 17.7,-34.6c4.5,-8 9.3,-15.9 13.8,-23.9c0.1,-0.2 0.2,-0.3 0.3,-0.5c0.8,-1.5 1.6,-3 2.4,-4.4c0.2,-0.3 0.3,-0.6 0.5,-0.9c2,-3.7 3.8,-7.4 5.6,-11.2c6.2,-13.4 10.2,-27.7 14,-41.9c0,-0.2 0.1,-0.3 0.1,-0.5c0.3,-1 0.5,-2 0.8,-2.9c4,-15.3 7.3,-31.4 13.5,-45.9c1.4,-3.3 3,-6.5 4.6,-9.6c0.1,-0.2 0.2,-0.3 0.3,-0.5c5,-9.7 10.6,-19.1 13.5,-29.7c2.6,-9.2 3.5,-19 3.6,-28.8c0,-0.2 0,-0.3 0,-0.5c0.1,-7.2 -0.1,-14.4 -0.4,-21.3c0.9,-5.6 1.9,-11.3 3,-16.9c0.2,-0.9 0.3,-1.7 0.5,-2.6c1.2,-5.9 2.5,-11.7 4.2,-17.4c0,-0.1 0.1,-0.3 0.1,-0.4c0,-0.2 0.1,-0.3 0.1,-0.5c0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9c12.8,-3.9 24.9,-9.9 36.3,-16.8c2.8,-1.7 5.6,-3.4 8.3,-5.2c0.2,-0.1 0.3,-0.2 0.5,-0.3c7.7,-4.9 15.2,-10.2 22.1,-16c3.1,-2.7 5.9,-5.6 8.3,-8.9c0.1,-0.2 0.2,-0.3 0.4,-0.5c2.3,-3.4 4.2,-7.2 5.3,-11.4c2.4,-9.2 1.9,-19 1.9,-28.4c0,-0.2 0,-0.4 0,-0.6l5.7,-5.6l-0.3,0.1l4.1,1.3l45.3,45l9.6,9.6l14.3,14.3l100.8,100.8l17.2,17.2l16.3,16.3l30.3,-30.3L442.3,348.5c0.5,-0.5 1.1,-1.6 1.4,-2.3c0.3,-0.6 0.5,-1.2 0.4,-1.9c0,-0.8 -0.2,-1.6 -0.6,-2.3c-0.1,-0.3 -0.3,-0.7 -0.4,-1c-0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8l191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7c4.1,0 8.2,0.1 11.9,1.9c0.5,0.3 1.3,0.7 2.1,1.1c1.7,2.3 3.5,4.5 5.7,6.2c2.7,2.1 8.2,3 9.4,0.3L2003,1441.1z"
-          android:fillColor="#AD2A2A"/>
-      <path
-          android:pathData="M619.3,797.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3H416.2c-4,0 -7.7,-2.3 -9.5,-5.6L375.8,821c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2l37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3L619.3,797.7z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="M389.7,254.5c0,-22.9 14.5,-42.6 35.3,-51.8c-1.5,-2.5 -2.4,-5.2 -2.4,-8.1c0,-11.1 12.8,-20.1 28.5,-20.1c0.4,0 0.7,0 1.1,0c6.5,-10.8 18.9,-18.1 33.1,-18.1c1,0 2,0 3,0.1c1.3,0.1 2.6,-0.5 3.3,-1.5c10.5,-16 37.1,-27.4 68.2,-27.4c11.5,0 22.4,1.6 32.1,4.3c2.3,-3.8 7.4,-6.4 13.3,-6.4c6.7,0 12.4,3.4 14.1,8.1c8.2,-9.5 22.1,-15.7 37.9,-15.7c25.2,0 45.6,15.9 45.6,35.5c0,2.4 -0.3,4.7 -0.9,7c-0.4,1.6 0.5,3.2 2.2,3.8c16.1,5.9 27,17.1 27,29.9c0,14.6 -14.1,27.1 -34,32c-1.6,0.4 -2.6,1.8 -2.6,3.3c0,0.1 0,0.2 0,0.3c0,11.3 -11.2,20.6 -25.6,21.6c0.1,0.5 0.1,1 0.1,1.6c0,21.7 -41.3,39.2 -92.2,39.2c-11,0 -21.5,-0.8 -31.2,-2.3c0,0.2 0,0.3 0,0.5c0,9 -11.6,16.3 -25.8,16.3c-0.8,0 -1.5,0 -2.2,-0.1c1,2.2 1.5,4.5 1.5,6.9c0,14 -17.7,25.3 -39.6,25.3c-2.4,0 -4.7,-0.1 -7,-0.4c-1.8,-0.2 -3.5,0.9 -3.9,2.6c-1.9,7 -8,12.1 -15.3,12.1c-8.8,0 -15.8,-7.5 -15.8,-16.7c0,-4.3 1.5,-8.2 4,-11.1c0.9,-1 1.2,-2.4 0.6,-3.6c-1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3C410.1,304.1 389.7,281.5 389.7,254.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="M873.4,884H749c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5L613.6,638c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7L506.9,581c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5L669,563.3c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6C887.3,873.9 882.4,884 873.4,884z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="M338.8,839.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1H128.7c-8.4,0 -13.5,-8.8 -9,-15.4L236,697.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4L317,761.5c-0.9,2.1 -1.1,4.4 -0.4,6.5L338.8,839.9z"
-          android:fillColor="#FFFFFF"/>
-    </group>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#ad2a2a"
+        android:pathData="M2465,1904v561h-759L704,1463l-120,-120 -1,-1 5,-9 1,-3c9,-15 20,-29 31,-43l16,-19 3,-4 21,-30 3,-6c7,-11 12,-23 18,-35l14,-24 3,-4v-1a234,234 0,0 0,20 -53v-1l1,-3c4,-15 7,-31 13,-46l5,-9v-1c5,-10 11,-19 14, -30 2,-9 3,-19 3,-28v-1,-21l3,-17v-3l4,-17h1v-1c0,-2 -1,-4 -3,-4l8,-8 4,1c13,-4 25,-10 37,-17l8,-5 22,-16 9,-9v-1l5, -11c3,-9 2,-19 2,-29l6,-6 4,2 45,45 10,9 14,14 101,101 17,17 16,17 31,-31 -193,-191 1,-2 1,-2 -1,-3v-1l-1,-1 27,-27 192,-192 2,1a27,27 0,0 1,14 3l6,6c2,2 8,3 9,1l1310,1310z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login_outlined_border.xml b/app/src/main/res/drawable/ic_login_outlined_border.xml
deleted file mode 100644
index c5d3c6867..000000000
--- a/app/src/main/res/drawable/ic_login_outlined_border.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@null" />
-    <stroke
-        android:width="1dip"
-        android:color="@color/spinner_stroke" />
-    <corners android:radius="4dip" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_main_attendance.xml b/app/src/main/res/drawable/ic_main_attendance.xml
new file mode 100644
index 000000000..58a40c68c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_attendance.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="#FFF"
+        android:pathData="M22 13l-1 1-2-2 1-1 2 2m-10 6l6-6 2 2-6 6h-2v-2M4 2h14a2 2 0 0 1 2 2v4l-4 4h-4v4l-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2m0 4v4h6V6H4m8 0v4h6V6h-6m-8 6v4h6v-4H4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_exam.xml b/app/src/main/res/drawable/ic_main_exam.xml
new file mode 100644
index 000000000..4bf81db1f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_exam.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="#FFF"
+        android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3a2,2 0,0 0,-2 2v14c0,1.1 0.9,2 2,2h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_grade.xml b/app/src/main/res/drawable/ic_main_grade.xml
new file mode 100644
index 000000000..2f342e334
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_grade.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="26dp"
+    android:viewportWidth="26"
+    android:viewportHeight="26">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2 2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_more_24dp.xml b/app/src/main/res/drawable/ic_main_more.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_menu_main_more_24dp.xml
rename to app/src/main/res/drawable/ic_main_more.xml
index 26932b2b2..7272c115f 100644
--- a/app/src/main/res/drawable/ic_menu_main_more_24dp.xml
+++ b/app/src/main/res/drawable/ic_main_more.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFF"
         android:pathData="M14,17L4,17v2h10v-2zM20,9L4,9v2h16L20,9zM4,15h16v-2L4,13v2zM4,5v2h16L20,5L4,5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml b/app/src/main/res/drawable/ic_main_timetable.xml
similarity index 65%
rename from app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml
rename to app/src/main/res/drawable/ic_main_timetable.xml
index 1594285f9..cf4741d50 100644
--- a/app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml
+++ b/app/src/main/res/drawable/ic_main_timetable.xml
@@ -4,7 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
-        android:pathData="M14 14H7v2h7m5 3H5V8h14m0-5h-1V1h-2v2H8V1H6v2H5a2 2 0 0 0-2 2v14a2
-            2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2m-2 7H7v2h10v-2z" />
+        android:fillColor="#FFF"
+        android:pathData="M14 14H7v2h7m5 3H5V8h14m0-5h-1V1h-2v2H8V1H6v2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2m-2 7H7v2h10v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_attendance_summary.xml b/app/src/main/res/drawable/ic_menu_attendance_summary.xml
new file mode 100644
index 000000000..4e1e1c7ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_attendance_summary.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="#FFF"
+        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, -2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml b/app/src/main/res/drawable/ic_menu_grade_semester.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
rename to app/src/main/res/drawable/ic_menu_grade_semester.xml
index 2a03f6300..a416f6990 100644
--- a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_grade_semester.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFF"
         android:pathData="M21,17V8H7V17H21M21,3A2,2 0,0 1,23 5V17A2,2 0,0 1,21 19H7C5.89,19 5,18.1 5,17V5A2,2 0,0 1,7 3H8V1H10V3H18V1H20V3H21M3,21H17V23H3C1.89,23 1,22.1 1,21V9H3V21M19,15H15V11H19V15Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml b/app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml
deleted file mode 100644
index eccc338fc..000000000
--- a/app/src/main/res/drawable/ic_menu_main_attendance_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- drawable/table_edit.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M22 13l-1 1-2-2 1-1 2 2m-10 6l6-6 2 2-6 6h-2v-2M4 2h14a2 2 0 0 1 2 2v4l-4 4h-4v4l-2
-            2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2m0 4v4h6V6H4m8 0v4h6V6h-6m-8 6v4h6v-4H4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml b/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml
deleted file mode 100644
index 13cfc8fad..000000000
--- a/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,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,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_exam_24dp.xml b/app/src/main/res/drawable/ic_menu_main_exam_24dp.xml
deleted file mode 100644
index 13179b7c3..000000000
--- a/app/src/main/res/drawable/ic_menu_main_exam_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#000"
-        android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3a2,2 0,0 0,-2 2v14c0,1.1 0.9,2
-            2,2h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_grade_26dp.xml b/app/src/main/res/drawable/ic_menu_main_grade_26dp.xml
deleted file mode 100644
index 3866cd3c7..000000000
--- a/app/src/main/res/drawable/ic_menu_main_grade_26dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportHeight="26"
-    android:viewportWidth="26">
-    <path
-        android:fillColor="#000"
-        android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2
-            2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2
-            2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_homework_24dp.xml b/app/src/main/res/drawable/ic_menu_main_homework_24dp.xml
deleted file mode 100644
index 449f0e28a..000000000
--- a/app/src/main/res/drawable/ic_menu_main_homework_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--https://materialdesignicons.com/icon/notebook-->
-<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="#000"
-        android:pathData="M3,7V5H5V4C5,2.89 5.9,2 7,2H13V9L15.5,7.5L18,9V2H19C20.05,2 21,2.95
-            21,4V20C21,21.05 20.05,22 19,22H7C5.95,22 5,21.05 5,20V19H3V17H5V13H3V11H5V7H3M7,
-            11H5V13H7V11M7,7V5H5V7H7M7,19V17H5V19H7Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_note_24dp.xml b/app/src/main/res/drawable/ic_menu_main_note_24dp.xml
deleted file mode 100644
index 6b3172baf..000000000
--- a/app/src/main/res/drawable/ic_menu_main_note_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--https://materialdesignicons.com/icon/trophy-->
-<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="#FF000000"
-        android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13
-            4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3
-            13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11
-            4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message_delete_24dp.xml b/app/src/main/res/drawable/ic_menu_message_delete.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_message_delete_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_delete.xml
index 4a577483d..e20c11455 100644
--- a/app/src/main/res/drawable/ic_message_delete_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_message_delete.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#000"
+        android:fillColor="#FFF"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_message_forward_24dp.xml b/app/src/main/res/drawable/ic_menu_message_forward.xml
similarity index 80%
rename from app/src/main/res/drawable/ic_message_forward_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_forward.xml
index 2b7c32c75..85c5406fa 100644
--- a/app/src/main/res/drawable/ic_message_forward_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_message_forward.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFF"
         android:pathData="M12,8V4l8,8 -8,8v-4H4V8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_message_reply_24dp.xml b/app/src/main/res/drawable/ic_menu_message_reply.xml
similarity index 82%
rename from app/src/main/res/drawable/ic_message_reply_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_reply.xml
index 010cb250b..14547e899 100644
--- a/app/src/main/res/drawable/ic_message_reply_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_message_reply.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFF"
         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/ic_menu_send_message_24dp.xml b/app/src/main/res/drawable/ic_menu_message_send.xml
similarity index 80%
rename from app/src/main/res/drawable/ic_menu_send_message_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_send.xml
index fcc5acfb0..910b96022 100644
--- a/app/src/main/res/drawable/ic_menu_send_message_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_message_send.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFF"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_send_message_24dp.xml b/app/src/main/res/drawable/ic_menu_message_write.xml
similarity index 63%
rename from app/src/main/res/drawable/ic_send_message_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_write.xml
index 0d82394be..08029cb99 100644
--- a/app/src/main/res/drawable/ic_send_message_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_message_write.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+        android:fillColor="#FFF"
+        android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87, 8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml b/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
rename to app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml
index c0664c370..221d46f81 100644
--- a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFF"
         android:pathData="M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V5A2,2 0,0 0,19 3M16.53,11.06L15.47,10L10.59,14.88L8.47,12.76L7.41,13.82L10.59,17L16.53,11.06Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_homework.xml b/app/src/main/res/drawable/ic_more_homework.xml
new file mode 100644
index 000000000..f705f76ce
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_homework.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="#FFF"
+        android:pathData="M3,7V5H5V4C5,2.89 5.9,2 7,2H13V9L15.5,7.5L18,9V2H19C20.05,2 21,2.95 21,4V20C21,21.05 20.05,22 19,22H7C5.95,22 5,21.05 5,20V19H3V17H5V13H3V11H5V7H3M7, 11H5V13H7V11M7,7V5H5V7H7M7,19V17H5V19H7Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_lucky_number.xml b/app/src/main/res/drawable/ic_more_lucky_number.xml
new file mode 100644
index 000000000..b349adcc6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_lucky_number.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="#FFF"
+        android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2, 9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83, 12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22, 8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml b/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
deleted file mode 100644
index f2e6152d8..000000000
--- a/app/src/main/res/drawable/ic_more_lucky_number_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="#FF000000"
-      android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_more_messages_24dp.xml b/app/src/main/res/drawable/ic_more_messages.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_more_messages_24dp.xml
rename to app/src/main/res/drawable/ic_more_messages.xml
index 65f32169d..f9c4ab646 100644
--- a/app/src/main/res/drawable/ic_more_messages_24dp.xml
+++ b/app/src/main/res/drawable/ic_more_messages.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFF"
         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,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_mobile_devices_24dp.xml b/app/src/main/res/drawable/ic_more_mobile_devices.xml
similarity index 59%
rename from app/src/main/res/drawable/ic_menu_main_mobile_devices_24dp.xml
rename to app/src/main/res/drawable/ic_more_mobile_devices.xml
index 150ced43d..6adeb6cff 100644
--- a/app/src/main/res/drawable/ic_menu_main_mobile_devices_24dp.xml
+++ b/app/src/main/res/drawable/ic_more_mobile_devices.xml
@@ -1,9 +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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
+        android:fillColor="#FFF"
+        android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_note.xml b/app/src/main/res/drawable/ic_more_note.xml
new file mode 100644
index 000000000..07bebe731
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_note.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="#FFF"
+        android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11 4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_settings.xml b/app/src/main/res/drawable/ic_more_settings.xml
new file mode 100644
index 000000000..af3b856cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_settings.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="#FFF"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19, -0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12, 0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23, 0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_settings_24dp.xml b/app/src/main/res/drawable/ic_more_settings_24dp.xml
deleted file mode 100644
index fc12cdcfe..000000000
--- a/app/src/main/res/drawable/ic_more_settings_24dp.xml
+++ /dev/null
@@ -1,17 +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="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,
-            -0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73
-            -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25
-            -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,
-            0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42
-            -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24
-            0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,
-            0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57
-            -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_timetable_swap_30dp.xml b/app/src/main/res/drawable/ic_timetable_swap.xml
similarity index 85%
rename from app/src/main/res/drawable/ic_timetable_swap_30dp.xml
rename to app/src/main/res/drawable/ic_timetable_swap.xml
index 01eee893c..4055623a7 100644
--- a/app/src/main/res/drawable/ic_timetable_swap_30dp.xml
+++ b/app/src/main/res/drawable/ic_timetable_swap.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#FFF"
         android:pathData="M7 11l-4 4 4 4v-3h7v-2H7v-3zm14-2l-4-4v3h-7v2h7v3l4-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_widget_chevron_24dp.png b/app/src/main/res/drawable/ic_widget_chevron.png
similarity index 100%
rename from app/src/main/res/drawable/ic_widget_chevron_24dp.png
rename to app/src/main/res/drawable/ic_widget_chevron.png
diff --git a/app/src/main/res/drawable/ic_widget_clover_24dp.png b/app/src/main/res/drawable/ic_widget_clover.png
similarity index 100%
rename from app/src/main/res/drawable/ic_widget_clover_24dp.png
rename to app/src/main/res/drawable/ic_widget_clover.png
diff --git a/app/src/main/res/drawable/layer_splash_background.xml b/app/src/main/res/drawable/layer_splash_background.xml
index 64812f151..2cf46d1d0 100644
--- a/app/src/main/res/drawable/layer_splash_background.xml
+++ b/app/src/main/res/drawable/layer_splash_background.xml
@@ -1,7 +1,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="#9a0007" />
+            <solid android:color="@color/colorPrimaryDark" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 70c06ce8f..84007c778 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/mainAppBarContainer"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/mainToolbar"
+        style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/WulkanowyTheme.ActionBar"
-        app:elevation="0dp">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/mainToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="wrap_content" />
 
     <FrameLayout
         android:id="@+id/mainFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/bottom_navigation_height"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:layout_marginTop="?actionBarSize"
+        android:layout_marginBottom="@dimen/bottom_navigation_height" />
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
         android:id="@+id/mainBottomNav"
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index 00b0e77ce..f59dcabdf 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -1,161 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     android:id="@+id/sendMessageContainer"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/sendMessageAppBarContainer"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/sendMessageToolbar"
+        style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/WulkanowyTheme.ActionBar"
-        app:elevation="0dp">
+        android:elevation="4dp"
+        app:layout_constraintBottom_toTopOf="@id/sendMessageScroll"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:targetApi="lollipop" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/sendMessageToolbar"
+    <io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView
+        android:id="@+id/sendMessageScroll"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar">
+
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
-    </com.google.android.material.appbar.AppBarLayout>
+            android:layout_height="match_parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/sendMessageContent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/sendMessageFromHint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="58dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/message_from"
+                    android:textColor="?android:textColorHint"
+                    android:textSize="18sp"
+                    app:layout_constraintEnd_toStartOf="@id/sendMessageFrom"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/sendMessageFrom"
+                    android:layout_width="0dp"
+                    android:layout_height="58dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:gravity="center_vertical"
+                    android:textSize="18sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/sendMessageFromHint"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="Jan Kowalski" />
+
+                <View
+                    android:id="@+id/sendMessageFromDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorDivider"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageFrom" />
+
+                <TextView
+                    android:id="@+id/sendMessageToHint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="58dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/message_to"
+                    android:textColor="?android:textColorHint"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageFromDivider" />
+
+                <io.github.wulkanowy.materialchipsinput.MaterialChipInput
+                    android:id="@+id/sendMessageTo"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:paddingTop="13dp"
+                    android:paddingBottom="13dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/sendMessageToHint"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageFromDivider" />
+
+                <View
+                    android:id="@+id/sendMessageToDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorDivider"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageTo" />
+
+                <EditText
+                    android:id="@+id/sendMessageSubject"
+                    android:layout_width="match_parent"
+                    android:layout_height="58dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:background="@android:color/transparent"
+                    android:gravity="center_vertical"
+                    android:hint="@string/message_subject"
+                    android:imeOptions="flagNoExtractUi"
+                    android:importantForAutofill="no"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageToDivider"
+                    tools:targetApi="o" />
+
+                <View
+                    android:id="@+id/sendMessageSubjectDivider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?colorDivider"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageSubject" />
+
+                <EditText
+                    android:id="@+id/sendMessageMessageContent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:gravity="start"
+                    android:hint="@string/message_content"
+                    android:imeOptions="flagNoExtractUi"
+                    android:importantForAutofill="no"
+                    android:inputType="textMultiLine"
+                    android:minHeight="58dp"
+                    android:paddingStart="16dp"
+                    android:paddingLeft="16dp"
+                    android:paddingTop="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingRight="16dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/sendMessageSubjectDivider"
+                    app:layout_constraintVertical_bias="0.0"
+                    tools:targetApi="o" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </FrameLayout>
+    </io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView>
 
     <LinearLayout
-        android:id="@+id/sendMessageContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/sendMessageAppBarContainer"
-        android:orientation="vertical">
+        android:id="@+id/sendMessageEmpty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar"
+        tools:ignore="UseCompoundDrawables">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center_horizontal"
+            app:srcCompat="@drawable/ic_more_messages"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="14dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/message_from"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="18sp" />
-
-            <androidx.appcompat.widget.AppCompatEditText
-                android:id="@+id/sendMessageFromTextView"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:background="@android:color/transparent"
-                android:enabled="false"
-                android:textColor="?android:attr/textColorPrimaryNoDisable"
-                tools:text="Jan Kowalski" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:paddingStart="14dp"
-            android:paddingLeft="14dp"
-            tools:ignore="RtlSymmetry">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginEnd="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/message_to"
-                android:textAlignment="center"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="18sp" />
-
-            <com.pchmn.materialchips.ChipsInput
-                android:id="@+id/sendMessageRecipientsInput"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@android:color/transparent"
-                app:horizontalScroll="true"
-                tools:layout_height="30dp">
-
-            </com.pchmn.materialchips.ChipsInput>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/sendMessageSubjectInput"
-            android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:background="@android:color/transparent"
-            android:hint="@string/message_subject"
-            android:inputType="text"
-            android:maxLines="1"
-            android:padding="14dp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/sendMessageContentInput"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/transparent"
-            android:gravity="top|start"
-            android:hint="@string/message_content"
-            android:inputType="textMultiLine"
-            android:paddingStart="14dp"
-            android:paddingLeft="14dp"
-            android:paddingTop="18dp"
-            android:paddingEnd="14dp"
-            android:paddingRight="14dp"
-            android:singleLine="false" />
+            android:layout_gravity="center_horizontal"
+            android:text="@string/error_unknown"
+            android:textSize="20sp"
+            tools:text="No messages" />
     </LinearLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/sendMessageAppBarContainer">
-
-        <LinearLayout
-            android:id="@+id/sendMessageEmpty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_more_messages_24dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/error_unknown"
-                android:textSize="20sp" />
-        </LinearLayout>
-
-        <ProgressBar
-            android:id="@+id/sendMessageProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-    </FrameLayout>
-</RelativeLayout>
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/sendMessageProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
index 192776e63..548b86041 100644
--- a/app/src/main/res/layout/activity_widget_configure.xml
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -5,7 +5,7 @@
     android:layout_width="280dp"
     android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/widgetConfigureTitle"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -14,7 +14,6 @@
         android:paddingEnd="24dp"
         android:paddingRight="24dp"
         android:text="@string/account_title"
-        android:textColor="?android:textColorPrimary"
         android:textSize="20sp"
         android:textStyle="bold"
         app:firstBaselineToTopHeight="40dp" />
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index 9469aae12..f2ee0bca7 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -5,7 +5,7 @@
     android:layout_width="280dp"
     android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountDialogTitle"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -27,24 +27,24 @@
         tools:itemCount="3"
         tools:listitem="@layout/item_account" />
 
-    <androidx.appcompat.widget.AppCompatButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/accountDialogAdd"
-        style="@style/Widget.AppCompat.Button.Borderless"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/accountDialogRecycler"
         android:layout_margin="8dp"
-        android:text="@string/account_add_new" />
+        android:text="@string/account_add_new"
+        android:textColor="?android:textColorPrimary" />
 
-    <androidx.appcompat.widget.AppCompatButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/accountDialogRemove"
-        style="@style/Widget.AppCompat.Button.Borderless"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/accountDialogRecycler"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_margin="8dp"
-        android:text="@string/account_logout"
-        android:textColor="@color/colorPrimary" />
+        android:text="@string/account_logout" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_attendance.xml b/app/src/main/res/layout/dialog_attendance.xml
index fe680d683..22268aac1 100644
--- a/app/src/main/res/layout/dialog_attendance.xml
+++ b/app/src/main/res/layout/dialog_attendance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -80,15 +80,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index 904d04ebd..ec25f6a4f 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -11,11 +11,10 @@
         android:layout_weight="1"
         android:orientation="vertical">
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:overScrollMode="ifContentScrolls"
-            tools:ignore="UselessParent">
+            android:overScrollMode="ifContentScrolls">
 
             <HorizontalScrollView
                 android:layout_width="350dp"
@@ -28,11 +27,12 @@
                     android:id="@+id/errorDialogContent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:scrollHorizontally="true"
+                    android:gravity="start"
                     android:textIsSelectable="true"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    tools:text="@tools:sample/lorem/random" />
             </HorizontalScrollView>
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
     </LinearLayout>
 
     <LinearLayout
@@ -43,28 +43,24 @@
         android:minHeight="52dp"
         android:orientation="horizontal">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCancel"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:gravity="center"
-            android:text="@android:string/cancel"
-            android:textColor="@color/colorPrimary" />
+            android:text="@android:string/cancel" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCopy"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:gravity="center"
-            android:text="@android:string/copy"
-            android:textColor="@color/colorPrimary" />
+            android:text="@android:string/copy" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_exam.xml b/app/src/main/res/layout/dialog_exam.xml
index 1f25195c7..8e46dc4f0 100644
--- a/app/src/main/res/layout/dialog_exam.xml
+++ b/app/src/main/res/layout/dialog_exam.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -101,16 +101,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/examDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="20dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
-
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index c744e45a3..f95b9cfdb 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +27,7 @@
                 android:layout_gravity="end"
                 android:background="@color/grade_material_default"
                 android:gravity="center"
-                android:textColor="@color/grade_text"
+                android:textColor="@android:color/white"
                 android:textSize="30sp"
                 tools:text="6" />
 
@@ -188,8 +188,9 @@
                 android:textIsSelectable="true"
                 android:textSize="12sp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeDialogClose"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@+id/gradeDialogDateValue"
@@ -197,13 +198,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:layout_marginTop="25dp"
-                android:background="?attr/selectableItemBackground"
-                android:focusable="true"
-                android:text="@string/all_close"
-                android:textAllCaps="true"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="15sp" />
-
+                android:text="@string/all_close" />
         </RelativeLayout>
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index fdfabc6f0..7ed9b795b 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -97,15 +97,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 161eb4c5b..47d6219ac 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -17,12 +17,14 @@
             android:layout_marginTop="20dp"
             android:layout_marginBottom="20dp"
             android:text="@string/all_details"
+            android:textColor="?android:textColorPrimary"
             android:textSize="20sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/timetable_lesson"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -31,6 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -39,6 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/completed_lessons_topic"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -47,6 +51,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -56,6 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/all_teacher"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -64,6 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -73,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/timetable_changes"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -82,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -92,7 +99,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/completed_lessons_absence"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -101,7 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -111,6 +118,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="@string/completed_lessons_resources"
+            android:textColor="?android:textColorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -120,19 +128,18 @@
             android:layout_marginTop="3dp"
             android:autoLink="web"
             android:text="@string/all_no_data"
+            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
 
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index c514205ad..7b1286053 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -23,10 +23,11 @@
                 android:id="@+id/mobileDeviceQr"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
                 android:layout_gravity="center"
+                android:layout_marginBottom="12dp"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/mobile_device_qr"
-                android:layout_marginBottom="12dp" />
+                tools:src="@tools:sample/avatars" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -75,24 +76,23 @@
                 android:textIsSelectable="true"
                 android:textSize="12sp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/mobileDeviceDialogClose"
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:layout_marginTop="15dp"
-                android:text="@string/all_close"
-                android:textAllCaps="true"
-                android:textSize="15sp" />
+                android:text="@string/all_close" />
         </LinearLayout>
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/mobileDeviceDialogProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:indeterminate="true"
             tools:visibility="invisible" />
     </FrameLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index e04683f85..0393e56af 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -81,15 +81,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/noteDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index 1cb650260..d94912faa 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -22,7 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/timetable_changes"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textSize="17sp" />
 
         <TextView
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
@@ -57,7 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp"
             android:visibility="gone" />
@@ -85,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp"
             android:visibility="gone" />
@@ -130,7 +130,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:text="@string/all_no_data"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textIsSelectable="true"
             android:textSize="12sp"
             android:visibility="gone" />
@@ -151,16 +151,13 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableDialogClose"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="15dp"
-            android:text="@string/all_close"
-            android:textAllCaps="true"
-            android:textSize="15sp" />
-
+            android:text="@string/all_close" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 000000000..556bdfd09
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/aboutRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 4627ffd13..1f2a9371b 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -9,8 +9,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/attendanceProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -34,15 +35,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_attendance_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_main_attendance"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -55,24 +55,25 @@
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/attendanceNavContainer"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/attendancePreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
             android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/attendanceNavDate"
@@ -81,16 +82,17 @@
             android:gravity="center"
             android:text="@string/app_name" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_weight="1"
             android:drawablePadding="4dp"
-            android:gravity="end|center"
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
             android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            android:textColor="?android:textColorPrimary" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml
index 5d03c2f4b..8b7fe6cf6 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -10,19 +10,19 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <LinearLayout
+        <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
             android:id="@+id/attendanceSummarySubjectsContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?android:attr/windowBackground"
-            android:elevation="5dp"
+            android:background="?android:windowBackground"
+            android:elevation="1dp"
             android:padding="5dp"
             android:visibility="invisible"
+            tools:ignore="UnusedAttribute"
             tools:listitem="@layout/item_attendance_summary"
-            tools:targetApi="lollipop"
             tools:visibility="visible">
 
-            <androidx.appcompat.widget.AppCompatSpinner
+            <Spinner
                 android:id="@+id/attendanceSummarySubjects"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
                 android:paddingRight="30dp"
                 android:paddingBottom="10dp"
                 android:spinnerMode="dialog" />
-        </LinearLayout>
+        </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/attendanceSummarySwipe"
@@ -50,12 +50,14 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/attendanceSummaryProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/attendanceSummaryEmpty"
@@ -63,15 +65,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_attendance_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_attendance"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 5dbd2c79a..155f18f93 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -9,8 +9,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/examProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -34,15 +35,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_exam_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_main_exam"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -55,24 +55,25 @@
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/examNavContainer"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/examPreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
             android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/examNavDate"
@@ -81,16 +82,16 @@
             android:gravity="center"
             android:text="@string/app_name" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/examNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
+            android:gravity="end|center_vertical"
+            android:insetLeft="8dp"
             android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            android:textColor="?android:textColorPrimary" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index bf8051753..ce614703c 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -9,12 +9,13 @@
         android:id="@+id/gradeTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/colorPrimary"
-        android:elevation="5dp"
+        android:background="?colorSurface"
+        android:elevation="4dp"
         android:visibility="invisible"
-        app:tabIndicatorColor="@android:color/white"
         app:tabMode="scrollable"
-        app:tabTextColor="@android:color/white"
+        app:tabSelectedTextColor="?colorPrimary"
+        app:tabTextColor="@color/mtrl_on_surface_emphasis_medium"
+        tools:ignore="UnusedAttribute"
         tools:visibility="visible" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -31,8 +32,9 @@
             tools:visibility="visible" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -46,15 +48,14 @@
         android:gravity="center"
         android:orientation="vertical"
         android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables"
         tools:visibility="visible">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_grade"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index 610006e17..125d43a95 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -16,8 +16,9 @@
             android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeDetailsProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -30,15 +31,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_grade"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index 9c7f37952..a3366a61f 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -6,24 +6,23 @@
     android:orientation="vertical"
     tools:context=".ui.modules.grade.statistics.GradeStatisticsFragment">
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/gradeStatisticsSubjectsContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/windowBackground"
-        android:elevation="5dp"
+        android:background="?android:windowBackground"
+        android:elevation="1dp"
         android:padding="5dp"
         android:visibility="invisible"
+        tools:ignore="UnusedAttribute"
         tools:listitem="@layout/item_attendance_summary"
-        tools:targetApi="lollipop"
         tools:visibility="visible">
 
-        <androidx.appcompat.widget.AppCompatSpinner
+        <Spinner
             android:id="@+id/gradeStatisticsSubjects"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="middle"
-            android:entries="@array/endpoints_keys"
             android:paddingStart="10dp"
             android:paddingLeft="10dp"
             android:paddingTop="10dp"
@@ -31,7 +30,7 @@
             android:paddingRight="30dp"
             android:paddingBottom="10dp"
             android:spinnerMode="dialog" />
-    </LinearLayout>
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -39,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fillViewport="true">
@@ -60,7 +59,7 @@
                     android:visibility="invisible"
                     tools:visibility="visible">
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/gradeStatisticsTypePartial"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -68,7 +67,7 @@
                         android:tag="partial"
                         android:text="@string/grade_statistics_partial" />
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/gradeStatisticsTypeSemester"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -85,13 +84,14 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_margin="10dp"
-                        android:background="?android:attr/windowBackground"
+                        android:background="?android:windowBackground"
                         android:minHeight="400dp"
                         android:visibility="gone"
                         tools:visibility="visible" />
 
-                    <ProgressBar
+                    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
                         android:id="@+id/gradeStatisticsProgress"
+                        style="@style/Widget.MaterialProgressBar.ProgressBar"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -104,15 +104,14 @@
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:visibility="invisible">
+                        android:visibility="invisible"
+                        tools:ignore="UseCompoundDrawables">
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:minWidth="100dp"
-                            android:minHeight="100dp"
-                            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-                            app:tint="?android:attr/textColorPrimary"
+                        <ImageView
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            app:srcCompat="@drawable/ic_main_grade"
+                            app:tint="?colorOnBackground"
                             tools:ignore="contentDescription" />
 
                         <TextView
@@ -125,6 +124,6 @@
                     </LinearLayout>
                 </FrameLayout>
             </LinearLayout>
-        </ScrollView>
+        </androidx.core.widget.NestedScrollView>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index 92a34f71c..2d9e7dc6f 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -16,8 +16,9 @@
             android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeSummaryProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -30,15 +31,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_main_grade"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index a2e87bcca..5f9fc40de 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -9,8 +9,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/homeworkProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -34,15 +35,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_homework_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_more_homework"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -55,24 +55,25 @@
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/homeworkNavContainer"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkPreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
             android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/homeworkNavDate"
@@ -81,16 +82,16 @@
             android:gravity="center"
             android:text="@string/app_name" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
             android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            android:textColor="?android:textColorPrimary" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
new file mode 100644
index 000000000..80ecd6b10
--- /dev/null
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/licenseProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/licenseRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 553c87260..5f6d2b5c8 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginFormProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -61,12 +62,14 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
 
-                <androidx.appcompat.widget.AppCompatEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/loginFormName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autofillHints="emailAddress"
                     android:inputType="textEmailAddress"
-                    android:maxLines="1" />
+                    android:maxLines="1"
+                    tools:targetApi="o" />
 
                 <requestFocus />
             </com.google.android.material.textfield.TextInputLayout>
@@ -89,20 +92,23 @@
                 app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
                 app:passwordToggleEnabled="true">
 
-                <androidx.appcompat.widget.AppCompatEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/loginFormPass"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
                     android:inputType="textPassword"
                     android:maxLines="1"
-                    app:fontFamily="sans-serif" />
+                    app:fontFamily="sans-serif"
+                    tools:targetApi="o" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <LinearLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormHostLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -110,40 +116,22 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="24dp"
                 android:layout_marginRight="24dp"
-                android:background="@drawable/ic_login_outlined_border"
+                android:hint="@string/login_host_hint"
                 android:orientation="vertical"
                 app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
 
-                <androidx.appcompat.widget.AppCompatSpinner
+                <AutoCompleteTextView
                     android:id="@+id/loginFormHost"
                     android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:entries="@array/endpoints_keys" />
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginBottom="48dp"
-                android:background="?android:windowBackground"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
-                android:text="@string/login_host_hint"
-                android:textColor="?android:textColorHint"
-                android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="@+id/loginFormHostLayout"
-                app:layout_constraintEnd_toEndOf="@+id/loginFormHostLayout"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout" />
+                    android:layout_height="wrap_content"
+                    tools:ignore="LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormSignIn"
-                style="@style/Widget.MaterialComponents.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -152,10 +140,6 @@
                 android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
-                android:textAppearance="?android:textAppearanceSmall"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                app:backgroundTint="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
@@ -180,15 +164,13 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormPrivacyLink"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
                 android:layout_marginRight="16dp"
                 android:text="@string/login_privacy_policy"
-                android:textAppearance="?android:textAppearance"
-                android:textColor="@color/colorPrimary"
                 android:visibility="invisible"
-                app:backgroundTint="?android:windowBackground"
                 app:fontFamily="sans-serif-medium"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
                 app:layout_constraintEnd_toStartOf="@+id/loginFormSignIn"
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index a94978bbf..5d74d066a 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginStudentSelectProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -54,7 +55,6 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/loginStudentSelectSignIn"
-            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
@@ -62,9 +62,6 @@
             android:layout_marginRight="24dp"
             android:layout_marginBottom="32dp"
             android:text="@string/login_sign_in"
-            android:textAppearance="?android:textAppearanceSmall"
-            android:textColor="@android:color/white"
-            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginStudentSelectRecycler" />
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 6c820889f..6aab8b2e1 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginSymbolProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -62,7 +63,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSymbolHeader">
 
-                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                <AutoCompleteTextView
                     android:id="@+id/loginSymbolName"
                     style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
                     android:layout_width="match_parent"
@@ -76,7 +77,6 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginSymbolSignIn"
-                style="@style/Widget.MaterialComponents.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="48dp"
@@ -84,10 +84,6 @@
                 android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
-                android:textAppearance="?android:textAppearanceSmall"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                app:backgroundTint="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSymbolNameLayout" />
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
index b881f1bda..5d3afda26 100644
--- a/app/src/main/res/layout/fragment_lucky_number.xml
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -5,8 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/luckyNumberProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -38,9 +39,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="52sp"
                 tools:text="14" />
-
         </LinearLayout>
-
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <LinearLayout
@@ -50,15 +49,15 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_more_lucky_number_24dp"
-            app:tint="?android:attr/textColorPrimary" />
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_lucky_number"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -67,7 +66,5 @@
             android:gravity="center"
             android:text="@string/lucky_number_empty"
             android:textSize="20sp" />
-
     </LinearLayout>
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 78edbb037..8a36e7f3e 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,14 +9,17 @@
         android:id="@+id/messageTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/colorPrimary"
-        android:elevation="5dp"
+        android:background="?colorSurface"
+        android:elevation="4dp"
         android:visibility="invisible"
         app:tabGravity="fill"
-        app:tabIndicatorColor="@android:color/white"
+        app:tabIndicatorColor="?colorPrimary"
         app:tabMaxWidth="0dp"
         app:tabMode="fixed"
-        app:tabTextColor="@android:color/white" />
+        app:tabSelectedTextColor="?colorPrimary"
+        app:tabTextColor="@color/mtrl_on_surface_emphasis_medium"
+        tools:ignore="UnusedAttribute"
+        tools:visibility="visible" />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/messageViewPager"
@@ -32,14 +36,14 @@
         android:layout_margin="16dp"
         android:clickable="true"
         android:focusable="true"
-        android:tint="#FFFFFF"
-        app:srcCompat="@drawable/ic_send_message_24dp" />
+        android:tint="?colorOnSecondary"
+        app:srcCompat="@drawable/ic_menu_message_write" />
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true" />
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 962d94ac2..eedba669d 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -30,7 +30,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="15sp"
                 tools:text="@tools:sample/full_names" />
 
@@ -39,7 +39,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dp"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="15sp"
                 tools:text="@tools:sample/date/ddmmyy" />
 
@@ -61,15 +61,14 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_more_messages_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_messages"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
@@ -81,8 +80,9 @@
             android:textSize="20sp" />
     </LinearLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messagePreviewProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message_tab.xml b/app/src/main/res/layout/fragment_message_tab.xml
index 31f1c8aa4..d7f3e706f 100644
--- a/app/src/main/res/layout/fragment_message_tab.xml
+++ b/app/src/main/res/layout/fragment_message_tab.xml
@@ -15,8 +15,9 @@
             android:layout_height="match_parent" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageTabProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -28,15 +29,14 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_more_messages_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_messages"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_mobile_device.xml b/app/src/main/res/layout/fragment_mobile_device.xml
index 289cf2f4d..b78dc067b 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.mobiledevice.MobileDeviceFragment">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/mobileDevicesProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -20,7 +21,8 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
 
         <TextView
             android:layout_width="wrap_content"
@@ -35,7 +37,7 @@
             android:layout_height="wrap_content"
             android:minWidth="100dp"
             android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_mobile_devices_24dp"
+            app:srcCompat="@drawable/ic_more_mobile_devices"
             app:tint="?android:attr/textColorPrimary"
             tools:ignore="contentDescription" />
     </LinearLayout>
@@ -58,8 +60,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:tint="#FFFFFF"
-        app:srcCompat="@drawable/ic_all_add_24dp" />
+        android:tint="?colorOnSecondary"
+        app:srcCompat="@drawable/ic_all_add" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index bc70682f6..41a9587db 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/noteProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -29,15 +30,14 @@
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:minHeight="100dp"
-            app:srcCompat="@drawable/ic_menu_main_note_24dp"
-            app:tint="?android:attr/textColorPrimary"
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_more_note"
+            app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 72621b2f5..5d704ebbf 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -9,8 +9,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/timetableProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -34,15 +35,14 @@
             android:gravity="center"
             android:orientation="vertical"
             android:padding="10dp"
-            android:visibility="gone">
+            android:visibility="gone"
+            tools:ignore="UseCompoundDrawables">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_main_timetable_24dp"
-                app:tint="?android:attr/textColorPrimary"
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_main_timetable"
+                app:tint="?colorOnBackground"
                 tools:ignore="contentDescription" />
 
             <TextView
@@ -55,24 +55,25 @@
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/timetableNavContainer"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/timetablePreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
             android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/timetableNavDate"
@@ -81,16 +82,16 @@
             android:gravity="center"
             android:text="@string/app_name" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
             android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            android:textColor="?android:textColorPrimary" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 381ae36c0..bddc3b673 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <ProgressBar
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/completedLessonsProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -38,12 +39,12 @@
             android:visibility="gone">
 
             <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/completedLessonsInfoImage"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:minWidth="100dp"
                 android:minHeight="100dp"
-                android:id="@+id/completedLessonsInfoImage"
-                app:srcCompat="@drawable/ic_menu_main_lessons_completed_24dp"
+                app:srcCompat="@drawable/ic_menu_timetable_lessons_completed"
                 app:tint="?android:attr/textColorPrimary"
                 tools:ignore="contentDescription" />
 
@@ -58,24 +59,25 @@
         </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <LinearLayout
+    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
+        android:id="@+id/completedLessonsNavContainer"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/windowBackground"
-        android:elevation="10dp"
-        android:orientation="horizontal">
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonsPreviousButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="start|center"
+            android:gravity="start|center_vertical"
+            android:insetLeft="8dp"
             android:text="@string/all_prev"
-            android:textAlignment="gravity" />
+            android:textColor="?android:textColorPrimary" />
 
         <TextView
             android:id="@+id/completedLessonsNavDate"
@@ -84,16 +86,16 @@
             android:gravity="center"
             android:text="@string/app_name" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonsNextButton"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_weight="1"
-            android:drawablePadding="4dp"
-            android:gravity="end|center"
+            android:gravity="end|center_vertical"
+            android:insetRight="8dp"
             android:text="@string/all_next"
-            android:textAlignment="gravity" />
-    </LinearLayout>
+            android:textColor="?android:textColorPrimary" />
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index e5b5af3d7..3a2e38c59 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -17,8 +17,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@string/app_name"
-        android:textSize="18sp" />
+        android:textSize="18sp"
+        tools:text="Monday" />
 
     <TextView
         android:id="@+id/examHeaderDate"
@@ -27,7 +27,6 @@
         android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
         android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
-
+        android:textSize="13sp"
+        tools:text="25.01.2020" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index 2f43ee28c..a83951dd5 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -4,7 +4,7 @@
     android:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
@@ -21,8 +21,8 @@
         android:layout_toLeftOf="@id/gradeHeaderNote"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/app_name"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        tools:text="Fizyka" />
 
     <TextView
         android:id="@+id/gradeHeaderAverage"
@@ -30,9 +30,9 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/gradeHeaderSubject"
         android:layout_marginTop="5dp"
-        android:text="@string/app_name"
         android:textColor="?android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="Average: 6,00" />
 
     <TextView
         android:id="@+id/gradeHeaderNumber"
@@ -44,17 +44,18 @@
         android:layout_marginTop="5dp"
         android:layout_toEndOf="@+id/gradeHeaderAverage"
         android:layout_toRightOf="@+id/gradeHeaderAverage"
-        android:text="@string/app_name"
         android:textColor="?android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="12 grades" />
 
-    <ImageView
+    <TextView
         android:id="@+id/gradeHeaderNote"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_round_note_24dp"
+        app:srcCompat="@drawable/ic_all_round_mark"
+        app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/header_homework.xml b/app/src/main/res/layout/header_homework.xml
index 526e8150a..207fcdb40 100644
--- a/app/src/main/res/layout/header_homework.xml
+++ b/app/src/main/res/layout/header_homework.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:textSize="18sp"
-        tools:text="@tools:sample/date/day_of_week" />
+        tools:text="Monday" />
 
     <TextView
         android:id="@+id/homeworkHeaderDate"
@@ -28,6 +28,5 @@
         android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
-        tools:text="@tools:sample/date/ddmmyy" />
-
+        tools:text="22.02.2022" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
new file mode 100644
index 000000000..b5dc3758c
--- /dev/null
+++ b/app/src/main/res/layout/item_about.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:background="?selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/aboutItemImage"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/ic_all_about" />
+
+    <TextView
+        android:id="@+id/aboutItemTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/aboutItemImage"
+        android:layout_toRightOf="@id/aboutItemImage"
+        android:ellipsize="end"
+        android:gravity="bottom"
+        android:maxLines="1"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/aboutItemSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_below="@id/aboutItemTitle"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/aboutItemImage"
+        android:layout_toRightOf="@id/aboutItemImage"
+        android:ellipsize="end"
+        android:gravity="bottom"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 5f76dded7..2abae138a 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:orientation="horizontal"
     android:paddingStart="24dp"
     android:paddingLeft="24dp"
@@ -12,16 +12,17 @@
     android:paddingRight="24dp"
     tools:context=".ui.modules.account.AccountItem">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_centerVertical="true"
         android:background="@drawable/ic_account_circular_border"
-        android:tint="#7E7E7E"
-        app:srcCompat="@drawable/ic_all_account_24dp" />
+        app:srcCompat="@drawable/ic_all_account"
+        app:tint="#7E7E7E"
+        tools:ignore="ContentDescription" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountItemName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,10 +34,9 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem/random"
-        android:textColor="?android:textColorSecondary"/>
+        tools:text="@tools:sample/full_names" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountItemSchool"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index e48a3f44c..95a8f0174 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -4,7 +4,7 @@
     android:id="@+id/attendanceItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
@@ -19,10 +19,10 @@
         android:layout_height="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
+        android:includeFontPadding="false"
         android:maxLength="2"
-        android:text="0"
         android:textSize="32sp"
-        tools:ignore="all" />
+        tools:text="5" />
 
     <TextView
         android:id="@+id/attendanceItemSubject"
@@ -33,13 +33,14 @@
         android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
         android:layout_marginRight="40dp"
+        android:layout_toStartOf="@id/attendanceItemAlert"
+        android:layout_toLeftOf="@id/attendanceItemAlert"
         android:layout_toEndOf="@+id/attendanceItemNumber"
         android:layout_toRightOf="@+id/attendanceItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/app_name"
         android:textSize="17sp"
-        tools:ignore="all" />
+        tools:text="Matematyka" />
 
     <TextView
         android:id="@+id/attendanceItemDescription"
@@ -49,9 +50,9 @@
         android:layout_alignLeft="@id/attendanceItemSubject"
         android:layout_alignBottom="@+id/attendanceItemNumber"
         android:maxLines="1"
-        android:text="@string/app_name"
         android:textColor="?android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="Present" />
 
     <ImageView
         android:id="@+id/attendanceItemAlert"
@@ -60,7 +61,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_note_24dp"
+        app:srcCompat="@drawable/ic_all_mark"
+        app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index 07392e56f..b49461955 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -65,7 +65,7 @@
             tools:text="50" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -96,7 +96,7 @@
             tools:text="0" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -127,7 +127,7 @@
             tools:text="25" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -158,7 +158,7 @@
             tools:text="0" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -189,7 +189,7 @@
             tools:text="6" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
@@ -220,7 +220,7 @@
             tools:text="0" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
diff --git a/app/src/main/res/layout/item_attendance_summary_subject.xml b/app/src/main/res/layout/item_attendance_summary_subject.xml
index 6e19a0817..263c08a73 100644
--- a/app/src/main/res/layout/item_attendance_summary_subject.xml
+++ b/app/src/main/res/layout/item_attendance_summary_subject.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceSummaryItemSubject"
     android:layout_width="match_parent"
     android:layout_height="48dp"
@@ -11,5 +12,5 @@
     android:textAlignment="textStart"
     android:paddingBottom="12dp"
     android:ellipsize="end"
-    android:text="@string/app_name"
+    tools:text="Geografia"
     android:textSize="16sp" />
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index 55c39f9d3..68c9ab957 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -1,18 +1,18 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/completedLesson_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:foreground="?selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.timetable.completed.CompletedLessonItem">
+    tools:context=".ui.modules.timetable.completed.CompletedLessonItem"
+    tools:ignore="UnusedAttribute">
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
@@ -20,6 +20,7 @@
         android:layout_height="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
+        android:includeFontPadding="false"
         android:maxLength="2"
         android:textSize="32sp"
         tools:ignore="all"
@@ -34,12 +35,13 @@
         android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
         android:layout_marginRight="40dp"
+        android:layout_toStartOf="@id/completedLessonItemAlert"
+        android:layout_toLeftOf="@id/completedLessonItemAlert"
         android:layout_toEndOf="@+id/completedLessonItemNumber"
         android:layout_toRightOf="@+id/completedLessonItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
-        tools:ignore="RelativeOverlap"
         tools:text="@tools:sample/lorem" />
 
     <TextView
@@ -66,7 +68,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_timetable_swap_30dp"
+        android:tint="?colorPrimary"
+        app:srcCompat="@drawable/ic_timetable_swap"
         tools:ignore="contentDescription" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index 801e1dea2..459a7ecb3 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -3,7 +3,7 @@
     android:id="@+id/exams_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     tools:context=".ui.modules.exam.ExamItem">
 
     <TextView
@@ -13,8 +13,8 @@
         android:layout_marginStart="20dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
-        android:text="@string/app_name"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/examItemType"
@@ -25,8 +25,8 @@
         android:layout_alignLeft="@id/examItemSubject"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/examItemTeacher"
@@ -44,6 +44,6 @@
         android:layout_toEndOf="@id/examItemType"
         android:layout_toRightOf="@id/examItemType"
         android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index 36632d04f..d6d99d9b8 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -4,7 +4,7 @@
     android:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
@@ -21,7 +21,7 @@
         android:background="@color/grade_material_default"
         android:gravity="center"
         android:maxLength="5"
-        android:textColor="@color/grade_text"
+        android:textColor="@android:color/white"
         android:textSize="16sp"
         tools:text="6" />
 
@@ -40,8 +40,8 @@
         android:layout_toRightOf="@+id/gradeItemValue"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/all_description"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/gradeItemDate"
@@ -50,8 +50,8 @@
         android:layout_alignStart="@+id/gradeItemDescription"
         android:layout_alignLeft="@+id/gradeItemDescription"
         android:layout_alignBottom="@+id/gradeItemValue"
-        android:text="@string/all_date"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/gradeItemWeight"
@@ -66,8 +66,8 @@
         android:layout_toLeftOf="@id/gradeItemNote"
         android:layout_toEndOf="@+id/gradeItemDate"
         android:layout_toRightOf="@+id/gradeItemDate"
-        android:text="@string/grade_weight"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
 
     <ImageView
         android:id="@+id/gradeItemNote"
@@ -76,6 +76,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_round_note_24dp"
+        app:srcCompat="@drawable/ic_all_round_mark"
+        app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index b08c8780f..a3a49ab62 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -24,7 +24,7 @@
             android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
-            tools:text="Fizyka" />
+            tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/gradeSummaryItemAverage"
@@ -95,7 +95,7 @@
             android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
-            tools:text="dobry" />
+            tools:text="5" />
     </LinearLayout>
 
     <LinearLayout
@@ -126,6 +126,6 @@
             android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
-            tools:text="bardzo dobry" />
+            tools:text="5" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 4e90a5828..5d03ed583 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -3,7 +3,7 @@
     android:id="@+id/homework_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     tools:context=".ui.modules.homework.HomeworkItem">
 
     <TextView
@@ -14,8 +14,8 @@
         android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/all_date"
-        android:textSize="17sp" />
+        android:textSize="17sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/homeworkItemTeacher"
@@ -31,8 +31,8 @@
         android:layout_toEndOf="@id/homeworkItemSubject"
         android:layout_toRightOf="@id/homeworkItemSubject"
         android:gravity="end"
-        android:text="@string/all_teacher"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/homeworkItemContent"
@@ -45,6 +45,6 @@
         android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
         android:lineSpacingMultiplier="1.2"
-        android:text="@string/all_content"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem/random" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_license.xml b/app/src/main/res/layout/item_license.xml
new file mode 100644
index 000000000..6a864433a
--- /dev/null
+++ b/app/src/main/res/layout/item_license.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:background="?selectableItemBackground"
+    android:orientation="vertical"
+    android:paddingStart="16dp"
+    android:paddingLeft="16dp"
+    android:paddingEnd="16dp"
+    android:paddingRight="16dp">
+
+    <TextView
+        android:id="@+id/licenseItemName"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:gravity="bottom"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/licenseItemSummary"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:gravity="bottom"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
index f896d99fb..254bff60f 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -3,10 +3,9 @@
     android:id="@+id/loginItemContainer"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?selectableItemBackground"
-    android:orientation="horizontal">
+    android:background="?selectableItemBackground">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/loginItemCheck"
         android:layout_width="32dp"
         android:layout_height="24dp"
@@ -15,18 +14,20 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="28dp"
         android:layout_marginRight="28dp"
-        android:layout_marginBottom="24dp"
+        android:background="@android:color/transparent"
         tools:text=" " />
 
     <TextView
         android:id="@+id/loginItemName"
         android:layout_width="wrap_content"
-        android:layout_height="34dp"
+        android:layout_height="32dp"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
         android:layout_toRightOf="@id/loginItemCheck"
+        android:ellipsize="end"
         android:gravity="bottom"
+        android:maxLines="1"
         android:textSize="16sp"
         tools:text="@tools:sample/full_names" />
 
@@ -43,6 +44,6 @@
         android:gravity="bottom"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
+        android:textSize="14sp"
         tools:text="@tools:sample/lorem/random" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 92aa48f59..ad914130a 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
@@ -33,7 +33,7 @@
         android:layout_toRightOf="@id/messageItemAuthor"
         android:gravity="end"
         android:textSize="13sp"
-        tools:text="@tools:sample/date/mmddyy" />
+        tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/messageItemSubject"
@@ -47,6 +47,5 @@
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
-        tools:text="@tools:sample/lorem" />
-
+        tools:text="@tools:sample/lorem/random" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index 97245f97a..95159d9bd 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -47,6 +47,6 @@
         android:layout_marginRight="4dp"
         android:background="?selectableItemBackgroundBorderless"
         android:contentDescription="@string/mobile_devices_unregister"
-        app:srcCompat="@drawable/ic_message_delete_24dp"
-        app:tint="?android:textColorSecondary" />
+        app:srcCompat="@drawable/ic_menu_message_delete"
+        app:tint="?colorOnBackground" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index 060fe99c1..6a941b96d 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:orientation="horizontal"
     android:paddingLeft="16dp"
     android:paddingTop="8dp"
@@ -12,21 +12,22 @@
     android:paddingBottom="8dp"
     tools:context=".ui.modules.more.MoreItem">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/moreItemImage"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
-        app:srcCompat="@drawable/ic_more_settings_24dp"
-        app:tint="?android:textColorSecondary" />
+        app:srcCompat="@drawable/ic_more_settings"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/moreItemTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
         android:layout_marginLeft="32dp"
-        android:text="@string/app_name"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 76fb6a8c3..a5d3e3623 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -3,7 +3,7 @@
     android:id="@+id/note_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     tools:context=".ui.modules.note.NoteItem">
 
     <TextView
@@ -13,8 +13,8 @@
         android:layout_marginStart="15dp"
         android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
-        android:text="@string/all_date"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/noteItemTeacher"
@@ -30,8 +30,8 @@
         android:layout_toEndOf="@id/noteItemDate"
         android:layout_toRightOf="@id/noteItemDate"
         android:gravity="end"
-        android:text="@string/all_teacher"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/noteItemType"
@@ -42,8 +42,8 @@
         android:layout_alignLeft="@id/noteItemDate"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:text="@string/exam_type"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/noteItemContent"
@@ -56,6 +56,6 @@
         android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
         android:lineSpacingMultiplier="1.2"
-        android:text="@string/all_description"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem/random" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index dd57f3e75..0072524a1 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,10 +1,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/timetable_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
@@ -19,10 +18,10 @@
         android:layout_height="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
+        android:includeFontPadding="false"
         android:maxLength="2"
-        android:text="0"
         android:textSize="32sp"
-        tools:ignore="all" />
+        tools:text="5" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
@@ -37,9 +36,8 @@
         android:layout_toRightOf="@+id/timetableItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@string/app_name"
         android:textSize="17sp"
-        tools:ignore="RelativeOverlap" />
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/timetableItemTime"
@@ -49,9 +47,9 @@
         android:layout_alignLeft="@id/timetableItemSubject"
         android:layout_alignBottom="@+id/timetableItemNumber"
         android:maxLines="1"
-        android:text="@string/app_name"
         android:textColor="?android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="11:11-12:00" />
 
     <TextView
         android:id="@+id/timetableItemRoom"
@@ -62,13 +60,14 @@
         android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
         android:layout_marginRight="40dp"
+        android:layout_toStartOf="@id/timetableItemAlert"
+        android:layout_toLeftOf="@id/timetableItemAlert"
         android:layout_toEndOf="@+id/timetableItemTime"
         android:layout_toRightOf="@+id/timetableItemTime"
         android:maxLines="1"
-        android:text="@string/app_name"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
-        tools:ignore="RelativeOverlap" />
+        tools:text="Room 22" />
 
     <ImageView
         android:id="@+id/timetableItemAlert"
@@ -77,7 +76,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_timetable_swap_30dp"
+        app:srcCompat="@drawable/ic_timetable_swap"
+        app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index aa8088640..bffc0bd5a 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -49,7 +49,7 @@
         android:layout_toRightOf="@id/timetableWidgetItemTime"
         android:textColor="@android:color/secondary_text_light"
         android:textSize="13sp"
-        tools:text="Język polski" />
+        tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/timetableWidgetItemDescription"
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
new file mode 100644
index 000000000..9b7bb7324
--- /dev/null
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="104dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/aboutScrollableHeaderIcon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/aboutScrollableHeaderName"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription"
+        tools:src="@mipmap/ic_launcher" />
+
+    <TextView
+        android:id="@+id/aboutScrollableHeaderName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="@id/aboutScrollableHeaderIcon"
+        app:layout_constraintLeft_toRightOf="@id/aboutScrollableHeaderIcon"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@id/aboutScrollableHeaderIcon" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/scrollable_header_attendance_summary.xml b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
index 37bbb32b1..94de11076 100644
--- a/app/src/main/res/layout/scrollable_header_attendance_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="20dp"
@@ -20,6 +21,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:text="100%"
-        android:textSize="21sp" />
+        android:textSize="21sp"
+        tools:text="100%" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/scrollable_header_grade_summary.xml b/app/src/main/res/layout/scrollable_header_grade_summary.xml
index cb28d43ec..ec069f8cf 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="20dp"
@@ -9,9 +10,9 @@
     <LinearLayout
         android:layout_width="150dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
         android:layout_marginEnd="5dp"
         android:layout_marginRight="5dp"
-        android:layout_marginTop="20dp"
         android:orientation="vertical">
 
         <TextView
@@ -27,8 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="6,00"
-            android:textSize="21sp" />
+            android:textSize="21sp"
+            tools:text="6,00" />
     </LinearLayout>
 
     <LinearLayout
@@ -50,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="6,00"
-            android:textSize="21sp" />
+            android:textSize="21sp"
+            tools:text="6,00" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_luckynumber.xml b/app/src/main/res/layout/widget_luckynumber.xml
index 026ac953b..ec12e4217 100644
--- a/app/src/main/res/layout/widget_luckynumber.xml
+++ b/app/src/main/res/layout/widget_luckynumber.xml
@@ -4,7 +4,7 @@
     android:id="@+id/luckyNumberWidgetContainer"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/background_rounded_corner"
+    android:background="@drawable/backgorund_luckynumber_widget"
     android:gravity="center"
     android:padding="10dp"
     tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
@@ -18,7 +18,7 @@
         android:layout_marginBottom="20dp"
         android:contentDescription="@string/lucky_number_title"
         android:gravity="center"
-        android:src="@drawable/ic_widget_clover_24dp"
+        android:src="@drawable/ic_widget_clover"
         android:visibility="gone"
         tools:visibility="visible" />
 
@@ -42,7 +42,7 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/luckyNumberWidgetNumber"
         android:contentDescription="@string/lucky_number_title"
-        android:src="@drawable/ic_widget_clover_24dp"
+        android:src="@drawable/ic_widget_clover"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 52469699d..aa2269ad0 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -63,7 +63,7 @@
             android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
-            android:src="@drawable/ic_widget_chevron_24dp"
+            android:src="@drawable/ic_widget_chevron"
             tools:targetApi="lollipop" />
 
         <ImageButton
@@ -76,7 +76,7 @@
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
-            android:src="@drawable/ic_widget_chevron_24dp"
+            android:src="@drawable/ic_widget_chevron"
             tools:targetApi="lollipop" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/menu/action_menu_attendance.xml b/app/src/main/res/menu/action_menu_attendance.xml
index 94baf338c..86c2fed71 100644
--- a/app/src/main/res/menu/action_menu_attendance.xml
+++ b/app/src/main/res/menu/action_menu_attendance.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/attendanceMenuSummary"
-        android:icon="@drawable/ic_menu_main_attendance_summary_24dp"
+        android:icon="@drawable/ic_menu_attendance_summary"
         android:orderInCategory="1"
         android:title="@string/attendance_summary_button"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_grade.xml b/app/src/main/res/menu/action_menu_grade.xml
index fdc1dbd01..4438309de 100644
--- a/app/src/main/res/menu/action_menu_grade.xml
+++ b/app/src/main/res/menu/action_menu_grade.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/gradeMenuSemester"
-        android:icon="@drawable/ic_menu_grade_semester_24dp"
+        android:icon="@drawable/ic_menu_grade_semester"
         android:orderInCategory="1"
         android:title="@string/grade_switch_semester"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_grade_details.xml b/app/src/main/res/menu/action_menu_grade_details.xml
index 938908291..6f8a1aea5 100644
--- a/app/src/main/res/menu/action_menu_grade_details.xml
+++ b/app/src/main/res/menu/action_menu_grade_details.xml
@@ -5,5 +5,6 @@
         android:id="@+id/gradeDetailsMenuRead"
         android:orderInCategory="100"
         android:title="@string/grade_menu_read"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_main.xml b/app/src/main/res/menu/action_menu_main.xml
index 7acc58c12..78b4ee4a8 100644
--- a/app/src/main/res/menu/action_menu_main.xml
+++ b/app/src/main/res/menu/action_menu_main.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/mainMenuAccount"
-        android:icon="@drawable/ic_all_account_24dp"
+        android:icon="@drawable/ic_all_account"
         android:orderInCategory="2"
         android:title="@string/main_account_picker"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index c3272aa20..f79797801 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -3,20 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/messagePreviewMenuReply"
-        android:icon="@drawable/ic_message_reply_24dp"
+        android:icon="@drawable/ic_menu_message_reply"
         android:orderInCategory="1"
         android:title="@string/message_reply"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuForward"
-        android:icon="@drawable/ic_message_forward_24dp"
+        android:icon="@drawable/ic_menu_message_forward"
         android:orderInCategory="1"
         android:title="@string/message_forward"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuDelete"
-        android:icon="@drawable/ic_message_delete_24dp"
+        android:icon="@drawable/ic_menu_message_delete"
         android:orderInCategory="1"
         android:title="@string/message_delete"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_send_message.xml b/app/src/main/res/menu/action_menu_send_message.xml
index d512fc763..491f74f97 100644
--- a/app/src/main/res/menu/action_menu_send_message.xml
+++ b/app/src/main/res/menu/action_menu_send_message.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sendMessageMenuSend"
-        android:icon="@drawable/ic_menu_send_message_24dp"
+        android:icon="@drawable/ic_menu_message_send"
         android:orderInCategory="1"
         android:title="@string/send_message_title"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_timetable.xml b/app/src/main/res/menu/action_menu_timetable.xml
index 0a13494ab..cfbdb6269 100644
--- a/app/src/main/res/menu/action_menu_timetable.xml
+++ b/app/src/main/res/menu/action_menu_timetable.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/timetableMenuCompletedLessons"
-        android:icon="@drawable/ic_menu_main_lessons_completed_24dp"
+        android:icon="@drawable/ic_menu_timetable_lessons_completed"
         android:orderInCategory="1"
         android:title="@string/completed_lessons_button"
+        app:iconTint="@color/mtrl_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1f..d59ec8e17 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..d59ec8e17 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index 31a481591..000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="spinner_stroke">#61FFFFFF</color>
-</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 342329dc6..307992365 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,35 +1,18 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Bridge">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="android:windowBackground">@color/bottom_nav_background</item>
-        <item name="bottomNavBackground">@color/bottom_nav_background</item>
-        <item name="android:navigationBarColor" tools:targetApi="21">@color/bottom_nav_background</item>
-        <item name="dividerColor">@color/divider_inverse</item>
-        <item name="chip_backgroundColor">@color/chip_backgroundColor_inverse</item>
-        <item name="android:textColorTertiary">?android:textColorPrimary</item>
-        <item name="chip_labelColor">@color/chip_labelColor_inverse</item>
-        <item name="chip_detailed_backgroundColor">@color/chip_backgroundColor_inverse</item>
-        <item name="filterable_list_backgroundColor">@color/filterable_list_backgroundColor_inverse</item>
-        <item name="filterable_list_textColor">@color/filterable_list_textColor_inverse</item>
-
-        <!--AboutLibraries specific values-->
-        <item name="about_libraries_window_background">@color/about_libraries_window_background_dark</item>
-        <item name="about_libraries_card">@color/about_libraries_card_dark</item>
-        <item name="about_libraries_title_openSource">@color/about_libraries_title_openSource_dark</item>
-        <item name="about_libraries_title_description">@color/about_libraries_title_openSource_dark</item>
-        <item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
-        <item name="about_libraries_special_button_openSource">@color/about_libraries_special_button_openSource_dark</item>
-        <item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource_dark</item>
-        <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
+    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents">
+        <item name="colorPrimary">@color/colorPrimaryLight</item>
+        <item name="colorSecondary">@color/colorPrimaryLight</item>
+        <item name="colorError">@color/colorErrorLight</item>
+        <item name="colorDivider">@color/colorDividerInverse</item>
+        <item name="android:windowBackground">?colorSurface</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
     <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:navigationBarColor" tools:targetApi="21">@android:color/black</item>
-        <item name="bottomNavBackground">@android:color/black</item>
+        <item name="colorSurface">@android:color/black</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 91d980a64..59bdb75aa 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -12,6 +12,7 @@
     <string name="settings_title">Ustawienia</string>
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</string>
+    <string name="license_title">Licencje</string>
     <string name="message_title">Wiadomości</string>
     <string name="send_message_title">Nowa wiadomość</string>
     <string name="note_title">Uwagi i osiągnięcia</string>
@@ -223,9 +224,21 @@
 
 
     <!--About-->
-    <string name="about_discord_invite">Discord</string>
+    <string name="about_version">Wersja aplikacji</string>
     <string name="about_feedback">Zgłoś błąd</string>
+    <string name="about_feedback_summary">Wyślij zgłoszenie o błedzię poprzez e-maila</string>
+    <string name="about_discord">Serwer discord</string>
+    <string name="about_discord_summary">Dołącz do społeczności wulkanowego</string>
+    <string name="about_privacy">Polityka prywatności</string>
+    <string name="about_privacy_summary">Zasady zbierania danych osobowych</string>
     <string name="about_homepage">Strona domowa</string>
+    <string name="about_homepage_summary">Odwiedź stronę i pomóż rozwijać aplikację</string>
+    <string name="about_licenses">Licencje</string>
+    <string name="about_licenses_summary">Licencje użytych bibliotek w aplikacji</string>
+
+
+    <!--Licenses-->
+    <string name="license_dialog_title">Licencja</string>
 
 
     <!--Generic-->
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..d1f36273b
--- /dev/null
+++ b/app/src/main/res/values-v23/styles.xml
@@ -0,0 +1,14 @@
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/layer_splash_background</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..d79e4ee00
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,17 @@
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@android:color/white</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/layer_splash_background</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index eef7eab48..accd3f807 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="bottomNavBackground" format="reference" />
-    <attr name="dividerColor" format="reference" />
+    <attr name="colorDivider" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1b1fc7a06..1707f0bff 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#d32f2f</color>
+    <color name="colorPrimaryLight">#e57373</color>
     <color name="colorPrimaryDark">#9a0007</color>
-    <color name="colorPrimaryLight">#ff6659</color>
-    <color name="colorBackgroundBottomNav">#f0f0f0</color>
+    <color name="colorError">#ff5722</color>
+    <color name="colorErrorLight">#e84853</color>
 
-    <color name="grade_text">#ffffff</color>
+    <color name="colorDivider">#1f000000</color>
+    <color name="colorDividerInverse">#1fffffff</color>
 
     <color name="grade_black">#424242</color>
     <color name="grade_red">#F44336</color>
@@ -29,17 +31,9 @@
     <color name="grade_vulcan_one">#d65757</color>
     <color name="grade_vulcan_default">#3d5f9c</color>
 
-    <color name="bottom_nav_background">#303030</color>
-    <color name="bottom_nav_background_inverse">#ffffff</color>
-
     <color name="chip_backgroundColor_inverse">#595959</color>
     <color name="chip_labelColor_inverse">#fefefe</color>
     <color name="chip_detailed_backgroundColor">#fefefe</color>
     <color name="filterable_list_backgroundColor_inverse">#393939</color>
     <color name="filterable_list_textColor_inverse">#fefefe</color>
-
-    <color name="divider">#cccccc</color>
-    <color name="divider_inverse">#777777</color>
-
-    <color name="spinner_stroke">#61000000</color>
 </resources>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index 9646c0b4e..000000000
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#D32F2F</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd94e5b68..8ebb4b84f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="settings_title">Settings</string>
     <string name="more_title">More</string>
     <string name="about_title">About</string>
+    <string name="license_title">Licenses</string>
     <string name="message_title">Messages</string>
     <string name="send_message_title">New message</string>
     <string name="note_title">Notes and achievements</string>
@@ -207,9 +208,21 @@
 
 
     <!--About-->
-    <string name="about_discord_invite">Discord</string>
+    <string name="about_version">App version</string>
     <string name="about_feedback">Report a bug</string>
+    <string name="about_feedback_summary">Send a bug report via e-mail</string>
+    <string name="about_discord">Discord server</string>
+    <string name="about_discord_summary">Join the wulkanowy community</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
     <string name="about_homepage">Homepage</string>
+    <string name="about_homepage_summary">Visit the website and help develop the application</string>
+    <string name="about_licenses">Licenses</string>
+    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
+
+
+    <!--Licenses-->
+    <string name="license_dialog_title">License</string>
 
 
     <!--Generic-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 58699c9e3..7edcd89ef 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,51 +1,32 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
+    <style name="BaseWulkanowyTheme" parent="@style/Theme.MaterialComponents.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="actionMenuTextColor">@android:color/primary_text_dark</item>
-        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
-        <item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
-        <item name="android:textColorTertiary">@android:color/primary_text_light</item>
-        <item name="android:textColorTertiaryInverse">@android:color/primary_text_dark</item>
-        <item name="titleTextColor">@android:color/primary_text_dark</item>
-        <item name="subtitleTextColor">@android:color/primary_text_dark</item>
-        <item name="android:colorBackground">@android:color/white</item>
-        <item name="bottomNavBackground">@color/bottom_nav_background_inverse</item>
-        <item name="dividerColor">@color/divider</item>
-        <item name="chip_detailed_backgroundColor">@color/chip_detailed_backgroundColor</item>
-
-        <!-- AboutLibraries specific values -->
-        <item name="about_libraries_window_background">@color/about_libraries_window_background</item>
-        <item name="about_libraries_card">@color/about_libraries_card</item>
-        <item name="about_libraries_title_openSource">@color/about_libraries_title_openSource</item>
-        <item name="about_libraries_title_description">@color/about_libraries_title_openSource</item>
-        <item name="about_libraries_text_openSource">@color/about_libraries_text_openSource</item>
-        <item name="about_libraries_special_button_openSource">@color/about_libraries_special_button_openSource</item>
-        <item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource</item>
-        <item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource</item>
+        <item name="colorSecondary">@color/colorPrimary</item>
+        <item name="colorOnSecondary">@android:color/white</item>
+        <item name="colorError">@color/colorError</item>
+        <item name="colorDivider">@color/colorDivider</item>
+        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/darker_gray</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
     </style>
 
-    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/layer_splash_background</item>
-    </style>
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
 
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="WulkanowyTheme.ActionBar" parent="WulkanowyTheme">
-        <item name="colorControlNormal">@android:color/white</item>
+    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/layer_splash_background</item>
+        <item name="android:statusBarColor" tools:targetApi="lollipop">@color/colorPrimaryDark</item>
     </style>
 
-    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.AppCompat.Light.Dialog">
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">
+        <item name="colorPrimary">@color/colorPrimary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
-        <item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 </resources>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index ccacfe9db..d762066ac 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,119 +1,118 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<?xml version="1.0" encoding="utf-8"?><!--suppress AndroidElementNotAllowed -->
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:title="@string/pref_view_header"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_view_header">
         <ListPreference
-            android:defaultValue="0"
-            android:entries="@array/startup_tab_entries"
-            android:entryValues="@array/startup_tab_value"
-            android:key="@string/pref_key_start_menu"
-            android:summary="%s"
-            android:title="@string/pref_view_list"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="0"
+            app:entries="@array/startup_tab_entries"
+            app:entryValues="@array/startup_tab_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_start_menu"
+            app:title="@string/pref_view_list"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="light"
-            android:entries="@array/app_theme_entries"
-            android:entryValues="@array/app_theme_values"
-            android:key="@string/pref_key_app_theme"
-            android:summary="%s"
-            android:title="@string/pref_view_app_theme"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_attendance_present"
-            android:title="@string/pref_view_present"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_expand_grade"
-            android:title="@string/pref_view_expand_grade"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="light"
+            app:entries="@array/app_theme_entries"
+            app:entryValues="@array/app_theme_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_app_theme"
+            app:title="@string/pref_view_app_theme"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_present"
+            app:title="@string/pref_view_present" />
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_expand_grade"
+            app:title="@string/pref_view_expand_grade" />
         <ListPreference
-            android:defaultValue="vulcan"
-            android:entries="@array/grade_color_scheme_entries"
-            android:entryValues="@array/grade_color_scheme_values"
-            android:key="@string/pref_key_grade_color_scheme"
-            android:summary="%s"
-            android:title="@string/pref_view_grade_color_scheme"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="vulcan"
+            app:entries="@array/grade_color_scheme_entries"
+            app:entryValues="@array/grade_color_scheme_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_color_scheme"
+            app:title="@string/pref_view_grade_color_scheme"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_services_header"
-        app:iconSpaceReserved="false">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_services_enable"
-            android:title="@string/pref_services_switch"
-            app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_services_header">
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_enable"
+            app:title="@string/pref_services_switch" />
         <ListPreference
-            android:defaultValue="60"
-            android:dependency="services_enable"
-            android:entries="@array/services_interval_entries"
-            android:entryValues="@array/services_interval_value"
-            android:key="@string/pref_key_services_interval"
-            android:summary="%s"
-            android:title="@string/pref_services_interval"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:dependency="services_enable"
-            android:key="@string/pref_key_services_wifi_only"
-            android:title="@string/pref_services_wifi"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="60"
+            app:dependency="services_enable"
+            app:entries="@array/services_interval_entries"
+            app:entryValues="@array/services_interval_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_interval"
+            app:title="@string/pref_services_interval"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:dependency="services_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_wifi_only"
+            app:title="@string/pref_services_wifi" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_notify_header"
-        app:iconSpaceReserved="false">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:dependency="services_enable"
-            android:key="@string/pref_key_notifications_enable"
-            android:title="@string/pref_notify_switch"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_notification_debug"
-            android:title="@string/pref_notify_debug_switch"
-            app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_notify_header">
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:dependency="services_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_enable"
+            app:title="@string/pref_notify_switch" />
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notification_debug"
+            app:title="@string/pref_notify_debug_switch" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_other_header"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_other_header">
         <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_plus"
-            android:summary="%s"
-            android:title="@string/pref_other_grade_modifier_plus"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="0.0"
+            app:entries="@array/grade_modifier_entries"
+            app:entryValues="@array/grade_modifier_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_modifier_plus"
+            app:title="@string/pref_other_grade_modifier_plus"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_minus"
-            android:summary="%s"
-            android:title="@string/pref_other_grade_modifier_minus"
-            app:iconSpaceReserved="false" />
+            app:defaultValue="0.0"
+            app:entries="@array/grade_modifier_entries"
+            app:entryValues="@array/grade_modifier_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_modifier_minus"
+            app:title="@string/pref_other_grade_modifier_minus"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
-            android:defaultValue="only_one_semester"
-            android:entries="@array/grade_average_mode_entries"
-            android:entryValues="@array/grade_average_mode_values"
-            android:key="@string/pref_key_grade_average_mode"
-            android:summary="%s"
-            android:title="@string/pref_view_grade_average_mode"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_grade_average_force_calc"
-            android:title="@string/pref_view_grade_average_force_calc"
-            app:iconSpaceReserved="false" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_fill_message_content"
-            android:title="@string/pref_other_fill_message_content"
+            app:defaultValue="only_one_semester"
+            app:entries="@array/grade_average_mode_entries"
+            app:entryValues="@array/grade_average_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_average_mode"
+            app:title="@string/pref_view_grade_average_mode"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="false"
+            app:key="@string/pref_key_grade_average_force_calc"
+            app:title="@string/pref_view_grade_average_force_calc"
             app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_fill_message_content"
+            app:title="@string/pref_other_fill_message_content" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
deleted file mode 100644
index 943fb1902..000000000
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.send
-
-import io.github.wulkanowy.data.db.entities.Recipient
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class TestRecipientChip {
-
-    @Test
-    fun testRecipientChipInfo() {
-        assertEquals("Uczeń", getRecipientChip("Kowalski Jan - Uczeń").info)
-        assertEquals("(JK) - pracownik [Fake123456]", getRecipientChip("Kowalski Jan (JK) - pracownik [Fake123456]").info)
-        assertEquals("[KK] - pracownik (Fake123456)", getRecipientChip("Kowalska Karolina [KK] - pracownik (Fake123456)").info)
-        assertEquals("(BK) - Nauczyciel [Fake123456]", getRecipientChip("Kowal-Mazur Barbara (BK) - Nauczyciel [Fake123456]").info)
-    }
-
-    private fun getRecipientChip(realName: String): RecipientChip {
-        return RecipientChip(Recipient(0, "", "", realName, 0, 0, 0, ""))
-    }
-}