diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index dcdde40f..d66c3361 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/.travis.yml b/.travis.yml
index 3b19799a..0ca2c03a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.9.4
+    - 0.10.0
 
 android:
  licenses:
diff --git a/app/build.gradle b/app/build.gradle
index 499f0636..bcdf0748 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 42
-        versionName "0.9.4"
+        versionCode 43
+        versionName "0.10.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -28,7 +28,8 @@ android {
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString(),
+                             "room.incremental"   : "true"]
             }
         }
     }
@@ -65,6 +66,7 @@ android {
     }
 
     flavorDimensions "platform"
+
     productFlavors {
         play {
             dimension "platform"
@@ -84,6 +86,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    packagingOptions {
+        exclude 'META-INF/library_release.kotlin_module'
+        exclude 'META-INF/library-core_release.kotlin_module'
+    }
 }
 
 androidExtensions {
@@ -98,38 +109,49 @@ play {
 }
 
 ext {
-    work_manager = "2.1.0"
-    room = "2.1.0"
+    work_manager = "2.2.0"
+    room = "2.2.0-beta01"
     dagger = "2.24"
     chucker = "2.0.4"
     mockk = "1.9.2"
-    mockito_core = "3.0.4"
+    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"
+    implementation "io.github.wulkanowy:api:0.10.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core:1.0.2"
-    implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.fragment:fragment:1.0.0"
+    implementation "androidx.core:core-ktx:1.1.0-rc03"
+    implementation "androidx.activity:activity-ktx:1.0.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.1.0-rc01"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0-rc01"
+    implementation "androidx.fragment:fragment-ktx:1.1.0-rc04"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "androidx.preference:preference-ktx:1.1.0-rc01"
+    implementation "androidx.recyclerview:recyclerview:1.1.0-beta03"
     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 "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
     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-runtime-ktx:$work_manager"
     implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-rxjava2:$room"
+    implementation "androidx.room:room-ktx:$room"
     kapt "androidx.room:room-compiler:$room"
 
     implementation "com.google.dagger:dagger-android-support:$dagger"
@@ -143,20 +165,18 @@ dependencies {
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.4"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.11"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.12"
 
     implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
     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:7.0.3"
 
-    implementation "com.mikepenz:aboutlibraries:6.2.3"
-    implementation "com.takisoft.preferencex:preferencex:1.0.0"
-
-    playImplementation "com.google.firebase:firebase-core:17.0.1"
+    playImplementation "com.google.firebase:firebase-core:17.2.0"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
@@ -168,7 +188,7 @@ dependencies {
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
     testImplementation "org.mockito:mockito-core:$mockito_core"
-    testImplementation("org.mockito:mockito-inline:3.0.4") {
+    testImplementation("org.mockito:mockito-inline:3.0.6") {
         exclude group: "org.mockito", module: "mockito-core"
     }
 
@@ -179,7 +199,7 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     androidTestImplementation "org.mockito:mockito-core:$mockito_core"
-    androidTestImplementation("org.mockito:mockito-android:3.0.4") {
+    androidTestImplementation("org.mockito:mockito-android:3.0.6") {
         exclude group: 'org.mockito', module: 'mockito-core'
     }
 }
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 44cd3f62..48a8fed9 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 7d42536d..a2d6346e 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/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index cecd8099..ee4c652f 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -5,7 +5,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
@@ -21,14 +21,14 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedHelper: SharedPrefHelper
+    private lateinit var sharedProvider: SharedPrefProvider
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index eea5463d..c38ffd99 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -7,7 +7,7 @@ import org.threeten.bp.LocalDateTime.now
 import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
 
-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = ""): TimetableLocal {
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
         studentId = 1,
         diaryId = 2,
@@ -23,12 +23,12 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
-        changes = false,
+        changes = changes,
         canceled = false
     )
 }
 
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
     return TimetableRemote(
         number = number,
         start = start.toDate(),
@@ -39,7 +39,7 @@ fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subje
         room = room,
         teacher = teacher,
         info = "",
-        changes = false,
+        changes = changes,
         canceled = false
     )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 79216d55..02ab605e 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -60,7 +60,7 @@ class TimetableRepositoryTest {
     }
 
     @Test
-    fun copyDetailsToCompletedFromPrevious() {
+    fun copyRoomToCompletedFromPrevious() {
         timetableLocal.saveTimetable(listOf(
             createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
             createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
@@ -83,7 +83,32 @@ class TimetableRepositoryTest {
         assertEquals("123", lessons[0].room)
         assertEquals("321", lessons[1].room)
         assertEquals("213", lessons[2].room)
+    }
 
-        assertEquals("", lessons[3].teacher)
+    @Test
+    fun copyTeacherToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda", "Jan Garnkiewicz", false),
+            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia", "Paweł Jumper", false),
+            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F", "", true),
+            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "", false)
+        ))
+
+        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda", "", true), // should override local
+            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia", "", false),
+            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F", "Jan Garnkiewicz", false),
+            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F", "Paweł Jumper", false)
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(4, lessons.size)
+        assertEquals("", lessons[0].teacher)
+        assertEquals("Paweł Jumper", lessons[1].teacher)
+        assertEquals("Jan Garnkiewicz", lessons[2].teacher)
+        assertEquals("Paweł Jumper", lessons[3].teacher)
     }
 }
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 6be79909..00000000
--- 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 00000000..799ea037
--- /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 7353dbd1..7dbec2cb 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 7353dbd1..7dbec2cb 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 9646c0b4..00000000
--- 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 5e4292f6..c644c863 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 85070edc..72969059 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -5,7 +5,6 @@ import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
-import androidx.work.WorkManager
 import com.jakewharton.threetenabp.AndroidThreeTen
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
@@ -13,6 +12,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
@@ -24,11 +24,14 @@ import timber.log.Timber
 import java.io.IOException
 import javax.inject.Inject
 
-class WulkanowyApp : DaggerApplication() {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
     lateinit var workerFactory: SyncWorkerFactory
 
+    @Inject
+    lateinit var themeManager: ThemeManager
+
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -41,20 +44,12 @@ class WulkanowyApp : DaggerApplication() {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
+        themeManager.applyDefaultTheme()
 
-        initWorkManager()
         initLogging()
         initCrashlytics(this, appInfo)
     }
 
-    private fun initWorkManager() {
-        WorkManager.initialize(this,
-            Configuration.Builder()
-                .setWorkerFactory(workerFactory)
-                .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-                .build())
-    }
-
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
@@ -76,4 +71,9 @@ class WulkanowyApp : DaggerApplication() {
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
         return DaggerAppComponent.factory().create(this)
     }
+
+    override fun getWorkManagerConfiguration() = Configuration.Builder()
+        .setWorkerFactory(workerFactory)
+        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
+        .build()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
similarity index 59%
rename from app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
rename to app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
index 74f9fa65..a6d0a067 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@@ -1,18 +1,15 @@
 package io.github.wulkanowy.data.db
 
-import android.annotation.SuppressLint
 import android.content.SharedPreferences
+import androidx.core.content.edit
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-@SuppressLint("ApplySharedPref")
-class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
+class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
 
     fun putLong(key: String, value: Long, sync: Boolean = false) {
-        sharedPref.edit().putLong(key, value).apply {
-            if (sync) commit() else apply()
-        }
+        sharedPref.edit(sync) { putLong(key, value) }
     }
 
     fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index 0e6331f9..e10e958e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -32,10 +32,11 @@ class TimetableRepository @Inject constructor(
                         .doOnSuccess { old ->
                             local.deleteTimetable(old.uniqueSubtract(new))
                             local.saveTimetable(new.uniqueSubtract(old).map { item ->
-                                item.apply {
-                                    old.singleOrNull { this.start == it.start }?.let {
-                                        return@map copy(
-                                            room = if (room.isEmpty()) it.room else room
+                                item.also { new ->
+                                    old.singleOrNull { new.start == it.start }?.let { old ->
+                                        return@map new.copy(
+                                            room = if (new.room.isEmpty()) old.room else new.room,
+                                            teacher = if (new.teacher.isEmpty() && !new.changes) old.teacher else new.teacher
                                         )
                                     }
                                 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
index 3ac3a525..c0329f7d 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
     AppModule::class,
     RepositoryModule::class,
     ServicesModule::class,
-    BuilderModule::class])
+    BindingModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {
 
     @Component.Factory
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
rename to app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
index a963e9a9..98061e60 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
@@ -6,16 +6,17 @@ 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 {
+internal abstract class BindingModule {
 
     @PerActivity
     @ContributesAndroidInjector
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 84409a84..3816856b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -1,8 +1,6 @@
 package io.github.wulkanowy.services
 
-import android.app.NotificationManager
 import android.content.Context
-import android.content.Context.NOTIFICATION_SERVICE
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.WorkManager
 import com.squareup.inject.assisted.dagger2.AssistedModule
@@ -28,6 +26,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 {
@@ -37,17 +36,12 @@ abstract class ServicesModule {
 
         @JvmStatic
         @Provides
-        fun provideWorkManager() = WorkManager.getInstance()
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
         @JvmStatic
         @Singleton
         @Provides
-        fun provideNotificationManagerCompat(context: Context) = NotificationManagerCompat.from(context)
-
-        @JvmStatic
-        @Singleton
-        @Provides
-        fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
     }
 
     @ContributesAndroidInjector
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index d85c75c3..98fc3522 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -8,9 +8,9 @@ import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
-import androidx.work.PeriodicWorkRequest
+import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
@@ -26,14 +26,13 @@ import javax.inject.Singleton
 class SyncManager @Inject constructor(
     private val workManager: WorkManager,
     private val preferencesRepository: PreferencesRepository,
-    sharedPrefHelper: SharedPrefHelper,
+    sharedPrefProvider: SharedPrefProvider,
     newEntriesChannel: NewEntriesChannel,
     debugChannel: DebugChannel,
     appInfo: AppInfo
 ) {
 
     companion object {
-
         private const val APP_VERSION_CODE_KEY = "app_version_code"
     }
 
@@ -45,18 +44,18 @@ class SyncManager @Inject constructor(
             if (appInfo.isDebug) debugChannel.create()
         }
 
-        if (sharedPrefHelper.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
+        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
             startSyncWorker(true)
-            sharedPrefHelper.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
+            sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
         }
-
         Timber.i("SyncManager was initialized")
     }
 
     fun startSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
-                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES, 10, MINUTES)
+                PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
+                    .setInitialDelay(10, MINUTES)
                     .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
                     .setConstraints(Constraints.Builder()
                         .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) UNMETERED else CONNECTED)
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 6a4c4ca6..19269899 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/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index 02fff569..166d3efc 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -3,15 +3,15 @@ package io.github.wulkanowy.services.sync.channels
 import android.annotation.TargetApi
 import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
+import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class DebugChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
 ) {
 
@@ -21,8 +21,9 @@ class DebugChannel @Inject constructor(
 
     fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT).apply {
-                lockscreenVisibility = VISIBILITY_PUBLIC
-            })
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
+                .apply {
+                    lockscreenVisibility = VISIBILITY_PUBLIC
+                })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
index 8e24a2a6..71624510 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
@@ -3,15 +3,15 @@ package io.github.wulkanowy.services.sync.channels
 import android.annotation.TargetApi
 import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_HIGH
 import android.content.Context
+import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class NewEntriesChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
 ) {
 
@@ -21,10 +21,11 @@ class NewEntriesChannel @Inject constructor(
 
     fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH).apply {
-                enableLights(true)
-                enableVibration(true)
-                lockscreenVisibility = VISIBILITY_PUBLIC
-            })
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = VISIBILITY_PUBLIC
+                })
     }
 }
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 0c70b476..cd863568 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 ebd536b7..1e366d58 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 d5016aee..c94f3aaf 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 86e540c4..235ef201 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/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index f3429457..7c7e6710 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.widgets
 import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.android.AndroidInjection
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
@@ -23,7 +23,7 @@ class TimetableWidgetService : RemoteViewsService() {
     lateinit var semesterRepo: SemesterRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     @Inject
     lateinit var schedulers: SchedulersProvider
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 6fc72d06..f0e51e31 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/BaseFragmentPagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
index fcf7e980..5f8bf417 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
@@ -4,14 +4,15 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 
-class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) :
+    FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     private val pages = mutableMapOf<Fragment, String?>()
 
     var containerId = 0
 
     fun getFragmentInstance(position: Int): Fragment? {
-        if (containerId == 0) throw IllegalArgumentException("Container id is 0")
+        require(containerId != 0) { "Container id is 0" }
         return fragmentManager.findFragmentByTag("android:switcher:$containerId:$position")
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index db3918b9..b74af6c5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -2,13 +2,13 @@ package io.github.wulkanowy.ui.base
 
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.content.Context.CLIPBOARD_SERVICE
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.core.content.getSystemService
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import kotlinx.android.synthetic.main.dialog_error.*
@@ -49,7 +49,7 @@ class ErrorDialog : DialogFragment() {
             errorDialogContent.text = writer.toString()
             errorDialogCopy.setOnClickListener {
                 ClipData.newPlainText("wulkanowyError", writer.toString()).let { clip ->
-                    (activity?.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip = clip
+                    activity?.getSystemService<ClipboardManager>()?.primaryClip = clip
                 }
                 Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
             }
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 449f451b..5b347fe8 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 79373be9..46dc5cfe 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 00000000..29f1cd8c
--- /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 cc5ba7cf..00000000
--- 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 736bf0ce..5303d361 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 00000000..07bb4124
--- /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 5b206ad8..318a75e4 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 00000000..2681680b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -0,0 +1,86 @@
+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.parseAsHtml
+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(licenseHtml.parseAsHtml())
+                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 00000000..98c86e75
--- /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 00000000..0ffc3d90
--- /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 00000000..b5b8fcd1
--- /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 00000000..3939d3e8
--- /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/account/AccountItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
index 972d10a2..d3a3ee6a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
@@ -1,13 +1,16 @@
 package io.github.wulkanowy.ui.modules.account
 
 import android.annotation.SuppressLint
+import android.graphics.PorterDuff
 import android.view.View
+import androidx.core.graphics.ColorUtils
 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 io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_account.*
 
@@ -15,16 +18,19 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
 
     override fun getLayoutRes() = R.layout.item_account
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
 
     @SuppressLint("SetTextI18n")
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
+        val context = holder.contentView.context
+
+        val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
             accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (student.isCurrent) R.drawable.ic_account_circular_border else 0)
+            accountItemImage.setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
         }
     }
 
@@ -45,8 +51,9 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
     }
 }
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 f3131098..fb6309f7 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
@@ -17,11 +17,13 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_attendance.*
 import javax.inject.Inject
 
-class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView, MainView.TitledView {
+class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendancePresenter
@@ -35,14 +37,11 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         fun newInstance() = AttendanceFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.attendance_title
+    override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty: Boolean
-        get() = attendanceAdapter.isEmpty
+    override val isViewEmpty get() = attendanceAdapter.isEmpty
 
-    override val currentStackSize: Int?
-        get() = (activity as? MainActivity)?.currentStackSize
+    override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -60,21 +59,21 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun initView() {
-        attendanceAdapter.apply {
-            setOnItemClickListener { presenter.onAttendanceItemSelected(it) }
-        }
+        attendanceAdapter.setOnItemClickListener(presenter::onAttendanceItemSelected)
 
-        attendanceRecycler.run {
+        with(attendanceRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceAdapter
             addItemDecoration(FlexibleItemDecoration(context)
                 .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+                .withDrawDividerOnLastItem(false))
         }
-        attendanceSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+
+        attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index 1845bdda..4109bbea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -15,6 +15,7 @@ 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.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject
@@ -35,11 +36,9 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
         fun newInstance() = AttendanceSummaryFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.attendance_title
+    override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty
-        get() = attendanceSummaryAdapter.isEmpty
+    override val isViewEmpty get() = attendanceSummaryAdapter.isEmpty
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_attendance_summary, container, false)
@@ -52,25 +51,26 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     }
 
     override fun initView() {
-        attendanceSummaryRecycler.run {
+        with(attendanceSummaryRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceSummaryAdapter
         }
-        attendanceSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
 
-        context?.let {
-            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
-            subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
-        }
+        attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
 
-        attendanceSummarySubjects.run {
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
+        subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
+
+        with(attendanceSummarySubjects) {
             adapter = subjectsAdapter
-            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
+
+        attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
-        subjectsAdapter.run {
+        with(subjectsAdapter) {
             clear()
             addAll(data)
             notifyDataSetChanged()
@@ -78,9 +78,9 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     }
 
     override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
-        attendanceSummaryAdapter.apply {
+        with(attendanceSummaryAdapter) {
             updateDataSet(data, true)
-            removeAllScrollableHeaders()
+            removeAllScrollableFooters()
             addScrollableHeader(header)
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index dc6fe5b3..40339299 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -46,7 +46,7 @@ class AttendanceSummaryPresenter @Inject constructor(
         loadData(currentSubjectId, true)
     }
 
-    fun onSubjectSelected(name: String) {
+    fun onSubjectSelected(name: String?) {
         Timber.i("Select attendance summary subject $name")
         view?.run {
             showContent(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index 47f6d587..c762fa15 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -16,6 +16,7 @@ import io.github.wulkanowy.data.db.entities.Exam
 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.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject
@@ -34,11 +35,9 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
         fun newInstance() = ExamFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.exam_title
+    override val titleStringId get() = R.string.exam_title
 
-    override val isViewEmpty: Boolean
-        get() = examAdapter.isEmpty
+    override val isViewEmpty get() = examAdapter.isEmpty
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_exam, container, false)
@@ -51,20 +50,21 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
     }
 
     override fun initView() {
-        examAdapter.run {
-            setOnItemClickListener { presenter.onExamItemSelected(it) }
-        }
-        examRecycler.run {
+        examAdapter.setOnItemClickListener(presenter::onExamItemSelected)
+
+        with(examRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = examAdapter
             addItemDecoration(FlexibleItemDecoration(context)
                 .withDefaultDivider(R.layout.item_exam)
-                .withDrawDividerOnLastItem(false)
-            )
+                .withDrawDividerOnLastItem(false))
         }
-        examSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
         examNextButton.setOnClickListener { presenter.onNextWeek() }
+
+        examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun hideRefresh() {
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 eb5e3669..68ae57ec 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
@@ -17,6 +17,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
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
@@ -37,11 +38,9 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
         fun newInstance() = GradeFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.grade_title
+    override val titleStringId get() = R.string.grade_title
 
-    override val currentPageIndex: Int
-        get() = gradeViewPager.currentItem
+    override val currentPageIndex get() = gradeViewPager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -64,7 +63,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun initView() {
-        pagerAdapter.apply {
+        with(pagerAdapter) {
             containerId = gradeViewPager.id
             addFragmentsWithTitle(mapOf(
                 GradeDetailsFragment.newInstance() to getString(R.string.all_details),
@@ -73,13 +72,18 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             ))
         }
 
-        gradeViewPager.run {
+        with(gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener(presenter::onPageSelected)
         }
-        gradeTabLayout.setupWithViewPager(gradeViewPager)
-        gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        with(gradeTabLayout) {
+            setupWithViewPager(gradeViewPager)
+            setElevationCompat(context.dpToPx(4f))
+        }
+
+        gradeSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -117,19 +121,19 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun showSemesterDialog(selectedIndex: Int) {
-        arrayOf(getString(R.string.grade_semester, 1),
-            getString(R.string.grade_semester, 2)).also { array ->
-            context?.let {
-                AlertDialog.Builder(it)
-                    .setSingleChoiceItems(array, selectedIndex) { dialog, which ->
-                        presenter.onSemesterSelected(which)
-                        dialog.dismiss()
-                    }
-                    .setTitle(R.string.grade_switch_semester)
-                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    .show()
+        val choices = arrayOf(
+            getString(R.string.grade_semester, 1),
+            getString(R.string.grade_semester, 2)
+        )
+
+        AlertDialog.Builder(requireContext())
+            .setSingleChoiceItems(choices, selectedIndex) { dialog, which ->
+                presenter.onSemesterSelected(which)
+                dialog.dismiss()
             }
-        }
+            .setTitle(R.string.grade_switch_semester)
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
     }
 
     fun onChildRefresh() {
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 46a923d9..52cf087b 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 a1cea6df..4b6c1675 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
@@ -19,6 +19,7 @@ import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import kotlinx.android.synthetic.main.fragment_grade_statistics.*
@@ -37,8 +38,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isViewEmpty
-        get() = gradeStatisticsChart.isEmpty
+    override val isViewEmpty get() = gradeStatisticsChart.isEmpty
 
     private lateinit var gradeColors: List<Pair<Int, Int>>
 
@@ -75,32 +75,30 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     }
 
     override fun initView() {
-        gradeStatisticsChart.run {
+        with(gradeStatisticsChart) {
             description.isEnabled = false
             setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
             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 {
-            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
-            subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
-        }
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
+        subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        gradeStatisticsSubjects.run {
+        with(gradeStatisticsSubjects) {
             adapter = subjectsAdapter
-            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        gradeStatisticsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+
+        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
-        subjectsAdapter.run {
+        with(subjectsAdapter) {
             clear()
             addAll(data)
             notifyDataSetChanged()
@@ -204,7 +202,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putBoolean(GradeStatisticsFragment.SAVED_CHART_TYPE, presenter.currentIsSemester)
+        outState.putBoolean(SAVED_CHART_TYPE, presenter.currentIsSemester)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
index 55ea611f..0259557a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -62,7 +62,7 @@ class GradeStatisticsPresenter @Inject constructor(
         view?.notifyParentRefresh()
     }
 
-    fun onSubjectSelected(name: String) {
+    fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
         view?.run {
             showContent(false)
@@ -71,8 +71,8 @@ class GradeStatisticsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        (subjects.singleOrNull { it.name == name }?.name).let {
-            if (it != currentSubjectName) loadData(currentSemesterId, name, currentIsSemester)
+        (subjects.singleOrNull { it.name == name }?.name)?.let {
+            if (it != currentSubjectName) loadData(currentSemesterId, it, currentIsSemester)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index 01fdc909..8195dd20 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -13,6 +13,7 @@ import io.github.wulkanowy.data.db.entities.Homework
 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.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_homework.*
 import javax.inject.Inject
@@ -31,8 +32,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
         fun newInstance() = HomeworkFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.homework_title
+    override val titleStringId get() = R.string.homework_title
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_homework, container, false)
@@ -45,21 +45,21 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
     }
 
     override fun initView() {
-        homeworkAdapter.run {
-            setOnItemClickListener { presenter.onHomeworkItemSelected(it) }
-        }
+        homeworkAdapter.setOnItemClickListener(presenter::onHomeworkItemSelected)
 
-        homeworkRecycler.run {
+        with(homeworkRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = homeworkAdapter
             addItemDecoration(FlexibleItemDecoration(context)
                 .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+                .withDrawDividerOnLastItem(false))
         }
-        homeworkSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
         homeworkNextButton.setOnClickListener { presenter.onNextDay() }
+
+        homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun updateData(data: List<HomeworkItem>) {
@@ -110,7 +110,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(HomeworkFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
     }
 
     override fun onDestroyView() {
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 7c3e7bac..a0b98be7 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 93db3679..94259aa8 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
@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
+import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -17,8 +18,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.*
 import javax.inject.Inject
@@ -35,14 +34,16 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         fun newInstance() = LoginFormFragment()
     }
 
-    override val formNameValue: String
-        get() = loginFormName.text.toString()
+    override val formNameValue get() = loginFormName.text.toString()
 
-    override val formPassValue: String
-        get() = loginFormPass.text.toString()
+    override val formPassValue get() = loginFormPass.text.toString()
 
-    override val formHostValue: String?
-        get() = resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+    override val formHostValue
+        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 +55,12 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun initView() {
-        loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
-        loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
-        loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
+        hostKeys = resources.getStringArray(R.array.endpoints_keys)
+        hostValues = resources.getStringArray(R.array.endpoints_values)
+
+        loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
         loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
         loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
 
@@ -64,40 +68,44 @@ 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) {
+            //Bug with filter in ExposedDropdownMenu on restoring state
+            isSaveEnabled = false
+
+            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)
     }
 
     override fun setErrorNameRequired() {
-        loginFormNameLayout.run {
+        with(loginFormNameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
-        loginFormPassLayout.run {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        loginFormPassLayout.run {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        loginFormPassLayout.run {
+        with(loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
@@ -129,7 +137,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
 
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
-        loginFormVersion.apply {
+        with(loginFormVersion) {
             visibility = VISIBLE
             text = "${getString(R.string.app_name)} ${appInfo.versionName}"
         }
@@ -140,11 +148,12 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun notifyParentAccountLogged(students: List<Student>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
-            loginFormName.text.toString(),
-            loginFormPass.text.toString(),
-            resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
-        ))
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students,
+            Triple(
+                loginFormName.text.toString(),
+                loginFormPass.text.toString(),
+                resources.getStringArray(R.array.endpoints_values)[1]
+            ))
     }
 
     override fun openPrivacyPolicyPage() {
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 540a91be..6949200c 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 80a7b5e9..2532547a 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 27723c53..fa21cff9 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/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 87de0a81..f4f0eb9e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -9,12 +9,12 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
+import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.setOnTextChangedListener
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_symbol.*
 import javax.inject.Inject
@@ -45,7 +45,7 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     override fun initView() {
         loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
 
-        loginSymbolName.setOnTextChangedListener { presenter.onSymbolTextChanged() }
+        loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
         loginSymbolName.apply {
             setOnEditorActionListener { _, id, _ ->
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 2ed0fa6f..6f4394ed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -14,7 +14,7 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val sharedPref: SharedPrefHelper
+    private val sharedPref: SharedPrefProvider
 ) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
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 66141c91..895fe571 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
@@ -21,13 +21,14 @@ import android.view.View.VISIBLE
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 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
@@ -51,7 +52,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
     lateinit var appWidgetManager: AppWidgetManager
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     companion object {
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
@@ -74,8 +75,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)
@@ -114,7 +115,9 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
         } catch (e: Exception) {
-            Timber.e(e, "An error has occurred in lucky number provider")
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in lucky number provider")
+            }
             null
         }
     }
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 779f0a49..4c7f7759 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 cc69005e..9444d58d 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 a74226bf..07e4c8d0 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 6aef573e..c53adc5b 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/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 7bd35f2d..7a3e135d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -16,6 +16,7 @@ import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_message.*
 import javax.inject.Inject
@@ -32,11 +33,9 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
         fun newInstance() = MessageFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.message_title
+    override val titleStringId get() = R.string.message_title
 
-    override val currentPageIndex: Int
-        get() = messageViewPager.currentItem
+    override val currentPageIndex get() = messageViewPager.currentItem
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_message, container, false)
@@ -48,7 +47,7 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     }
 
     override fun initView() {
-        pagerAdapter.apply {
+        with(pagerAdapter) {
             containerId = messageViewPager.id
             addFragmentsWithTitle(mapOf(
                 MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
@@ -57,12 +56,16 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
             ))
         }
 
-        messageViewPager.run {
+        with(messageViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener(presenter::onPageSelected)
+        }
+
+        with(messageTabLayout) {
+            setupWithViewPager(messageViewPager)
+            setElevationCompat(context.dpToPx(4f))
         }
-        messageTabLayout.setupWithViewPager(messageViewPager)
 
         openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
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 e4c202d9..c772466f 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 be433b00..00000000
--- 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 00000000..dd2d2b9b
--- /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 5c6e74b0..7b15da71 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 4808fafc..3b89b5ca 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 8a2cb4f6..2839f9ce 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 8b50a1c8..e21b4d16 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 f9fd5bbf..89367725 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 9c1abb90..e82c7554 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 60de9920..cb172b98 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 3c3d4990..88d38e0d 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/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index e60be74c..a580a417 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -17,11 +17,13 @@ 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.ui.modules.timetable.completed.CompletedLessonsFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable.*
 import javax.inject.Inject
 
-class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView, MainView.TitledView {
+class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: TimetablePresenter
@@ -35,17 +37,13 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         fun newInstance() = TimetableFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.timetable_title
+    override val titleStringId get() = R.string.timetable_title
 
-    override val roomString: String
-        get() = getString(R.string.timetable_room)
+    override val roomString get() = getString(R.string.timetable_room)
 
-    override val isViewEmpty: Boolean
-        get() = timetableAdapter.isEmpty
+    override val isViewEmpty get() = timetableAdapter.isEmpty
 
-    override val currentStackSize: Int?
-        get() = (activity as? MainActivity)?.currentStackSize
+    override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,11 +61,9 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun initView() {
-        timetableAdapter.run {
-            setOnItemClickListener { presenter.onTimetableItemSelected(it) }
-        }
+        timetableAdapter.setOnItemClickListener(presenter::onTimetableItemSelected)
 
-        timetableRecycler.run {
+        with(timetableRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = timetableAdapter
             addItemDecoration(FlexibleItemDecoration(context)
@@ -75,9 +71,12 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
                 .withDrawDividerOnLastItem(false)
             )
         }
-        timetableSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         timetableNextButton.setOnClickListener { presenter.onNextDay() }
+
+        timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
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 baf347ae..54439e0a 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 f56652d5..c7b5c6ca 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,8 @@ 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.dpToPx
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable_completed.*
 import javax.inject.Inject
@@ -31,11 +32,9 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
         fun newInstance() = CompletedLessonsFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.completed_lessons_title
+    override val titleStringId get() = R.string.completed_lessons_title
 
-    override val isViewEmpty
-        get() = completedLessonsAdapter.isEmpty
+    override val isViewEmpty get() = completedLessonsAdapter.isEmpty
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
@@ -48,17 +47,18 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     }
 
     override fun initView() {
-        completedLessonsAdapter.run {
-            setOnItemClickListener { presenter.onCompletedLessonsItemSelected(it) }
-        }
+        completedLessonsAdapter.setOnItemClickListener(presenter::onCompletedLessonsItemSelected)
 
-        completedLessonsRecycler.run {
+        with(completedLessonsRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = completedLessonsAdapter
         }
-        completedLessonsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
         completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+
+        completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun updateData(data: List<CompletedLessonItem>) {
@@ -82,10 +82,8 @@ 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))
-        }
+        completedLessonsInfo.text = getString(R.string.error_feature_disabled)
+        completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
     }
 
     override fun showProgress(show: Boolean) {
@@ -114,7 +112,7 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(CompletedLessonsFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index 60fd03aa..9c0202db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -14,7 +14,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val sharedPref: SharedPrefHelper
+    private val sharedPref: SharedPrefProvider
 ) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index b288f7b7..a0a519e2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -11,7 +11,7 @@ import android.widget.AdapterView.INVALID_POSITION
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -28,7 +28,7 @@ class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val sharedPref: SharedPrefHelper,
+    private val sharedPref: SharedPrefProvider,
     private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
@@ -60,8 +60,6 @@ class TimetableWidgetFactory(
                     .filter { true }
                     .flatMap { studentRepository.getSavedStudents().toMaybe() }
                     .flatMap {
-                        if (studentId == 0L) throw IllegalArgumentException("Student id is 0")
-
                         it.singleOrNull { student -> student.id == studentId }
                             .let { student ->
                                 if (student != null) Maybe.just(student)
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 a462ca7b..dadbe050 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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
@@ -15,12 +16,13 @@ import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 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
@@ -43,7 +45,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     lateinit var studentRepository: StudentRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     @Inject
     lateinit var schedulers: SchedulersProvider
@@ -110,6 +112,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         }
     }
 
+    @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
         RemoteViews(context.packageName, R.layout.widget_timetable).apply {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
@@ -130,8 +133,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 {
@@ -173,7 +176,9 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
         } catch (e: Exception) {
-            Timber.e(e, "An error has occurred in timetable widget provider")
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in timetable widget provider")
+            }
             null
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
rename to app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt
index e6f01497..0f121dc5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt
@@ -1,14 +1,13 @@
-package io.github.wulkanowy.ui.modules.grade
+package io.github.wulkanowy.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
-import com.google.android.material.tabs.TabLayout
 
 /**
  * @see <a href="https://stackoverflow.com/a/50382854">Tabs don't fit to screen with tabmode=scrollable, Even with a Custom Tab Layout</a>
  */
-class CustomTabLayout : TabLayout {
+class FittedScrollableTabLayout : MaterialTabLayout {
 
     constructor(context: Context) : super(context)
 
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 00000000..cad26f2e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import androidx.core.view.ViewCompat
+import com.google.android.material.elevation.ElevationOverlayProvider
+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)
+    }
+
+    override fun setElevation(elevation: Float) {
+        super.setElevation(elevation)
+        if (background is MaterialShapeDrawable) {
+            (background as MaterialShapeDrawable).elevation = elevation
+        }
+    }
+
+    fun setElevationCompat(elevation: Float) {
+        if (SDK_INT >= LOLLIPOP) {
+            setElevation(elevation)
+        } else {
+            setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation))
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt
new file mode 100644
index 00000000..3bcaae7d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.util.AttributeSet
+import com.google.android.material.elevation.ElevationOverlayProvider
+import com.google.android.material.tabs.TabLayout
+
+open class MaterialTabLayout : TabLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attr: AttributeSet) : super(context, attr)
+
+    constructor(context: Context, attr: AttributeSet, defStyleAttr: Int) : super(context, attr, defStyleAttr)
+
+    fun setElevationCompat(elevation: Float) {
+        if (SDK_INT >= LOLLIPOP) {
+            setElevation(elevation)
+        } else {
+            setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation))
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
index 93781a9f..e9cac72e 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
@@ -1,17 +1,15 @@
 package io.github.wulkanowy.utils
 
 import android.app.Activity
-import android.content.Context.INPUT_METHOD_SERVICE
 import android.view.inputmethod.InputMethodManager
+import androidx.core.content.getSystemService
 
 fun Activity.showSoftInput() {
-    (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?)?.run {
-        if (currentFocus != null) showSoftInput(currentFocus, 0)
+    getSystemService<InputMethodManager>()?.let { manager ->
+        currentFocus?.let { manager.showSoftInput(it, 0) }
     }
 }
 
 fun Activity.hideSoftInput() {
-    (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?)?.run {
-        hideSoftInputFromWindow(window.decorView.applicationWindowToken, 0)
-    }
+    getSystemService<InputMethodManager>()?.hideSoftInputFromWindow(window.decorView.applicationWindowToken, 0)
 }
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 c367ecd0..a941c6fa 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/EditTextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
deleted file mode 100644
index caa977ec..00000000
--- a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.text.Editable
-import android.text.TextWatcher
-import android.widget.EditText
-
-inline fun EditText.setOnTextChangedListener(crossinline listener: () -> Unit) {
-    addTextChangedListener(object : TextWatcher {
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            listener()
-        }
-
-        override fun afterTextChanged(s: Editable?) {}
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-    })
-}
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 dcf47754..9cec331f 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 00000000..1fc3185c
--- /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 d21b998b..00000000
--- 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/java/io/github/wulkanowy/utils/SpinnerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
index d9e34e87..1f721690 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
@@ -7,14 +7,15 @@ import android.widget.Spinner
 /**
  * @see <a href="https://stackoverflow.com/a/29602298">How to keep onItemSelected from firing off on a newly instantiated Spinner?</a>
  */
-inline fun Spinner.setOnItemSelectedListener(crossinline listener: (view: View?) -> Unit) {
+@Suppress("UNCHECKED_CAST")
+inline fun <T : View> Spinner.setOnItemSelectedListener(crossinline listener: (view: T?) -> Unit) {
     onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
         override fun onNothingSelected(parent: AdapterView<*>?) {}
         override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
             onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onNothingSelected(parent: AdapterView<*>?) {}
                 override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                    listener(view)
+                    listener(view as T?)
                 }
             }
         }
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 512e5055..f60764da 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,6 +1,7 @@
-Wersja 0.9.4
+Wersja 0.10.0
 
-- naprawienie nawigacji we frekwencji, sprawdzianach, planie lekcji na wakacjach
-- wyświetlanie szczęśliwego numerka po ostatniej aktualizacji dziennika VULCAN (19.06)
+- odświeżyliśmy wygląd aplikacji
+- poprawiliśmy wyświetlanie nauczycieli w planie lekcji
+- naprawiliśmy szczęsliwy numerek
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
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 00000000..2774dd5d
--- /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 00000000..4699c457
--- /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 00000000..cb42d7cc
--- /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 00000000..d6b0d4d1
--- /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 00538168..00000000
--- 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 00000000..d97efb5d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_grade.png differ
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 00000000..ce0fdabc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_message.png differ
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 00000000..7318c419
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_note.png differ
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 ea5b85c8..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify_grade.png and /dev/null differ
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 86d63c58..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify_message.png and /dev/null differ
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 b49e4ad2..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify_note.png and /dev/null differ
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 00000000..c85b2702
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_grade.png differ
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 00000000..b357b321
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_message.png differ
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 00000000..55a4fbbf
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_note.png differ
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 64fd285d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify_grade.png and /dev/null differ
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 73a1653a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify_message.png and /dev/null differ
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 3498f71c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify_note.png and /dev/null differ
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 00000000..a6a9e253
--- /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 ca44eb29..cd444a28 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 5fa58e90..1b4b64ec 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 00000000..c55ca7fd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_grade.png differ
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 00000000..0e67ade3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_message.png differ
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 00000000..ea674a79
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_note.png differ
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 83b2c443..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify_grade.png and /dev/null differ
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 b373ffd4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify_message.png and /dev/null differ
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 5aa30e5f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify_note.png and /dev/null differ
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 00000000..eeb6fa41
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png differ
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 00000000..2e881824
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_message.png differ
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 00000000..174e1509
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_note.png differ
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 cba48ec2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_grade.png and /dev/null differ
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 dc15bbd9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_message.png and /dev/null differ
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 db3ec517..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_note.png and /dev/null differ
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 3b40ad3f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_message.png and /dev/null differ
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 06a9299a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_note.png and /dev/null differ
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 116973b5..38cbde9b 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 00000000..bcca42bf
--- /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="M9.375,4.031 L8.75,4.094c0,0 -2.742,0.296 -4.75,1.875L3.969,5.969L3.938,6C3.488,6.406 3.308,6.898 3,7.625 2.6336,8.5013 2.3203,9.399 2.062,10.313 1.478,12.37 1,14.843 1,17.125v0.219l0.094,0.187c0.726,1.246 2.023,2.047 3.218,2.594 1.196,0.547 2.223,0.82 2.938,0.844L7.719,21 8.812,18.656C9.722,18.856 10.797,19 12,19c1.203,0 2.246,-0.145 3.156,-0.344L16.25,21 16.719,20.969c0.715,-0.024 1.742,-0.297 2.937,-0.844 1.196,-0.547 2.492,-1.348 3.219,-2.594l0.094,-0.187v-0.219c0,-2.281 -0.446,-4.754 -1.032,-6.813C21.6789,9.3987 21.366,8.5017 21,7.626 20.691,6.899 20.48,6.407 20.031,6.001L20,5.969C17.992,4.391 15.219,4.094 15.219,4.094L14.625,4.031c0,0 -0.453,1.516 -0.594,2.157C13.3576,6.0959 12.6795,6.0432 12,6.03 11.582,6.03 10.86,6.07 9.969,6.187 9.829,5.546 9.375,4.03 9.375,4.03ZM8.125,6.188C8.16,6.289 8.223,6.418 8.25,6.5L9.1478,8.2815C10.3888,8.0461 11.5032,8 12,8c0.5086,0 1.6647,0.0483 2.9411,0.2987L15.813,6.5c0.027,-0.082 0.12,-0.21 0.156,-0.313 1.0837,0.1962 2.1092,0.6344 3,1.282 -0.008,0.004 0.324,0.406 0.593,1 0.278,0.61 0.567,1.426 0.844,2.344 0.532,1.761 0.934,4.082 0.969,5.968 -0.492,0.696 -1.406,1.336 -2.375,1.75 -0.848,0.364 -1.29,0.496 -1.688,0.563l-0.406,-0.875c0.23,-0.078 0.27,-0.074 0.469,-0.157 1.207,-0.488 1.844,-1.03 1.844,-1.03l-0.813,-1.563c0,0 -0.441,0.367 -1.468,0.781C15.91,16.664 14.133,17.094 12,17.094 9.867,17.094 8.469,16.664 7.437,16.25 6.407,15.836 5.969,15.469 5.969,15.469L4.75,17.03c0,0 0.668,0.543 1.875,1.032 0.2,0.082 0.266,0.078 0.5,0.156L6.687,19.093C6.289,19.026 5.817,18.893 4.969,18.53 3.996,18.112 3.086,17.476 2.594,16.78 2.629,14.894 3.031,12.573 3.563,10.812 3.84,9.894 4.16,9.077 4.437,8.468 4.707,7.874 5.007,7.472 5,7.468 6.156,6.628 7.395,6.323 8.125,6.187ZM9.5,11C8.672,11 8,11.895 8,13c0,1.105 0.672,2 1.5,2 0.828,0 1.5,-0.895 1.5,-2 0,-1.105 -0.672,-2 -1.5,-2zM14.5,11c-0.828,0 -1.5,0.895 -1.5,2 0,1.105 0.672,2 1.5,2 0.828,0 1.5,-0.895 1.5,-2 0,-1.105 -0.672,-2 -1.5,-2z"/>
+</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 00000000..a348cb6a
--- /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,5s-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,8zM16,12v3c0,0.22 -0.03,0.47 -0.07,0.7l-0.1,0.65 -0.37,0.65c-0.72,1.24 -2.04,2 -3.46,2s-2.74,-0.77 -3.46,-2l-0.37,-0.64 -0.1,-0.65C8.03,15.48 8,15.23 8,15v-4c0,-0.23 0.03,-0.48 0.07,-0.7l0.1,-0.65 0.37,-0.65c0.3,-0.52 0.72,-0.97 1.21,-1.31l0.57,-0.39 0.74,-0.18c0.31,-0.08 0.63,-0.12 0.94,-0.12 0.32,0 0.63,0.04 0.95,0.12l0.68,0.16 0.61,0.42c0.5,0.34 0.91,0.78 1.21,1.31l0.38,0.65 0.1,0.65c0.04,0.22 0.07,0.47 0.07,0.69v1zM10,14h4v2h-4zM10,10h4v2h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_delete_24dp.xml b/app/src/main/res/drawable/ic_about_homepage.xml
similarity index 58%
rename from app/src/main/res/drawable/ic_message_delete_24dp.xml
rename to app/src/main/res/drawable/ic_about_homepage.xml
index 4a577483..1ec60812 100644
--- a/app/src/main/res/drawable/ic_message_delete_24dp.xml
+++ b/app/src/main/res/drawable/ic_about_homepage.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#000"
-        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" />
+        android:fillColor="#FFF"
+        android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z"/>
 </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 00000000..1a052734
--- /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 00000000..109f05df
--- /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,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/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 550f312e..3dfbbda1 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 00000000..0e917d5f
--- /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,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_account_24dp.xml b/app/src/main/res/drawable/ic_all_account_24dp.xml
deleted file mode 100644
index dea10cb3..00000000
--- 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_message_forward_24dp.xml b/app/src/main/res/drawable/ic_all_add.xml
similarity index 63%
rename from app/src/main/res/drawable/ic_message_forward_24dp.xml
rename to app/src/main/res/drawable/ic_all_add.xml
index 2b7c32c7..e4566293 100644
--- a/app/src/main/res/drawable/ic_message_forward_24dp.xml
+++ b/app/src/main/res/drawable/ic_all_add.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:pathData="M12,8V4l8,8 -8,8v-4H4V8z" />
+        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 e3979cd7..00000000
--- 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 3809c797..3f89a8fa 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 f46b3ad7..61e96497 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 988df22c..12721649 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 f4f1f2c5..91afb233 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 cfec6390..ee11f89d 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 c5d3c686..00000000
--- 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 00000000..c42a17b3
--- /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="M4,2C2.8954,2 2,2.8954 2,4v14c0,1.1046 0.8954,2 2,2h6l2,-2v-4h4l2,-2L12,12L12,8h6v4l2,-2L20,4C20,2.8954 19.1046,2 18,2ZM4,4L18,4L18,6L4,6ZM4,8h6v4L4,12ZM20,13 L19,14 21,16 22,15zM4,14h6v4L4,18ZM18,15 L12,21v2h2l6,-6z" />
+</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 00000000..a705c0a4
--- /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="M19,3L18,3L18,1L16,1L16,3L8,3L8,1L6,1L6,3L5,3C3.89,3 3.01,3.9 3.01,5L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5C21,3.9 20.1,3 19,3ZM19,19L5,19L5,9L19,9ZM19,7L5,7L5,5h14zM12,12h5v5h-5z" />
+</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 00000000..7577f399
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_grade.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M13,11H15V13H13M13,15H15A2,2 0 0,0 17,13V11C17,9.89 16.1,9 15,9H13V7H17V5H13A2,2 0 0,0 11,7V13C11,14.11 11.9,15 13,15M21,17H7V3H21M21,1H7A2,2 0 0,0 5,3V17A2,2 0 0,0 7,19H21A2,2 0 0,0 23,17V3A2,2 0 0,0 21,1M3,5H1V21A2,2 0 0,0 3,23H19V21H3V5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_more.xml b/app/src/main/res/drawable/ic_main_more.xml
new file mode 100644
index 00000000..1b436a32
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_more.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_timetable.xml b/app/src/main/res/drawable/ic_main_timetable.xml
new file mode 100644
index 00000000..b8f5cb85
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_timetable.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,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM5,7L5,5h14v2L5,7zM7,11h10v2L7,13zM7,15h7v2L7,17z" />
+</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 00000000..f0dab549
--- /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,-2zM19,19L5,19L5,5h14v14zM7,10h2v7L7,17zM11,7h2v10h-2zM15,13h2v4h-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_grade_semester.xml b/app/src/main/res/drawable/ic_menu_grade_semester.xml
new file mode 100644
index 00000000..8eb86922
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_grade_semester.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="M8,1L8,3L7,3C5.8954,3 5,3.8954 5,5v12c0,1.1 0.89,2 2,2h14c1.1046,0 2,-0.8954 2,-2L23,5C23,3.8954 22.1046,3 21,3L20,3L20,1L18,1L18,3L10,3L10,1ZM7,5L21,5L21,6.9414L7,6.9414ZM7,9h14v8L7,17ZM1,9v12c0,1.1 0.89,2 2,2L17,23L17,21L3,21L3,9ZM15,11v4h4v-4z" />
+</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_24dp.xml
deleted file mode 100644
index 2a03f630..00000000
--- a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="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 eccc338f..00000000
--- 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 13cfc8fa..00000000
--- 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 13179b7c..00000000
--- 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 3866cd3c..00000000
--- 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 449f0e28..00000000
--- 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_lessons_completed_24dp.xml b/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
deleted file mode 100644
index c0664c37..00000000
--- a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,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_menu_main_more_24dp.xml b/app/src/main/res/drawable/ic_menu_main_more_24dp.xml
deleted file mode 100644
index 26932b2b..00000000
--- a/app/src/main/res/drawable/ic_menu_main_more_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        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_note_24dp.xml b/app/src/main/res/drawable/ic_menu_main_note_24dp.xml
deleted file mode 100644
index 6b3172ba..00000000
--- 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_menu_main_timetable_24dp.xml b/app/src/main/res/drawable/ic_menu_main_timetable_24dp.xml
deleted file mode 100644
index 1594285f..00000000
--- a/app/src/main/res/drawable/ic_menu_main_timetable_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: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" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message_reply_24dp.xml b/app/src/main/res/drawable/ic_menu_message_delete.xml
similarity index 55%
rename from app/src/main/res/drawable/ic_message_reply_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_delete.xml
index 010cb250..e60947c8 100644
--- a/app/src/main/res/drawable/ic_message_reply_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_message_delete.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:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
+        android:fillColor="#FFF"
+        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_send_message_24dp.xml b/app/src/main/res/drawable/ic_menu_message_forward.xml
similarity index 60%
rename from app/src/main/res/drawable/ic_menu_send_message_24dp.xml
rename to app/src/main/res/drawable/ic_menu_message_forward.xml
index fcc5acfb..97e34dda 100644
--- a/app/src/main/res/drawable/ic_menu_send_message_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:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+        android:fillColor="#FFF"
+        android:pathData="M14,8.83L17.17,12 14,15.17V14H6v-4h8V8.83M12,4v4H4v8h8v4l8,-8 -8,-8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_reply.xml b/app/src/main/res/drawable/ic_menu_message_reply.xml
new file mode 100644
index 00000000..d9c66711
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_reply.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,5L3,12L10,19L10,14.9004C15,14.9004 18.5,16.5 21,20C20,15 17,10 10,9L10,5zM8,9.8281L8,10.7344L9.7168,10.9805C12.4581,11.3721 14.2573,12.4578 15.6641,13.8516C13.929,13.2778 12.0718,12.9004 10,12.9004L8,12.9004L8,14.1719L5.8281,12L8,9.8281z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_send.xml b/app/src/main/res/drawable/ic_menu_message_send.xml
new file mode 100644
index 00000000..fe72265f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_send.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="M4.01,6.03l7.51,3.22 -7.52,-1 0.01,-2.22m7.5,8.72L4,17.97v-2.22l7.51,-1M2.01,3L2,10l15,2 -15,2 0.01,7L23,12 2.01,3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_write.xml b/app/src/main/res/drawable/ic_menu_message_write.xml
new file mode 100644
index 00000000..7068aa5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_write.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,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM5.92,19H5v-0.92l9.06,-9.06 0.92,0.92L5.92,19zM20.71,5.63l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29s-0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml b/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.xml
new file mode 100644
index 00000000..a521adee
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_timetable_lessons_completed.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,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM5,7L5,5h14v2L5,7zM10.56,17.46l5.93,-5.93 -1.06,-1.06 -4.87,4.87 -2.11,-2.11 -1.06,1.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 00000000..9641ff70
--- /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="M7,2C5.9,2 5,2.89 5,4L5,5L3,5v2h2v4L3,11v2h2v4L3,17v2h2v1c0,1.05 0.95,2 2,2h12c1.05,0 2,-0.95 2,-2L21,4C21,2.95 20.05,2 19,2ZM7,4h4v6.5996L14.5,8.5 18,10.5996L18,4h1L19,20L7,20L7,5ZM13,4h3L16,7.4004L14.5,6.5 13,7.4004Z" />
+</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 00000000..d644288c
--- /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="M9.6895,2C8.1895,2 7,3.25 7,4.75C7,6.64 8.7,8.1797 12,11.1797C15.3,8.1797 17,6.6395 17,4.6895C17,3.1895 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.6095,2 9.6895,2zM9.6895,4C10.0877,4 10.3217,4.1233 10.5059,4.3301L12,6.0078L13.4941,4.3301C13.6783,4.1233 13.9481,4 14.25,4C14.6922,4 15,4.3006 15,4.6895C15,5.0833 14.8867,5.4382 14.2012,6.2598C13.7754,6.7701 12.8089,7.6367 11.998,8.3965C11.187,7.6372 10.2202,6.77 9.793,6.2617C9.1048,5.4431 9,5.0954 9,4.75C9,4.3078 9.3006,4 9.6895,4zM4.6895,7C3.1895,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.3905 2,14.3105C2,15.8105 3.25,17 4.75,17C6.64,17 8.1797,15.3 11.1797,12C8.1797,8.7 6.6395,7 4.6895,7zM19.25,7C17.36,7 15.8201,8.7 12.8301,12C15.8201,15.3 17.3605,17 19.3105,17C20.8105,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.6095 22,9.6895C22,8.1895 20.75,7 19.25,7zM4.6895,9C5.0833,9 5.4382,9.1133 6.2598,9.7988C6.7701,10.2246 7.6367,11.1911 8.3965,12.002C7.6372,12.813 6.77,13.7798 6.2617,14.207C5.4431,14.8952 5.0954,15 4.75,15C4.3078,15 4,14.6994 4,14.3105C4,13.9123 4.1233,13.6783 4.3301,13.4941L6.0078,12L4.3301,10.5059C4.1233,10.3217 4,10.0519 4,9.75C4,9.3078 4.3006,9 4.6895,9zM19.25,9C19.6922,9 20,9.3006 20,9.6895C20,10.0877 19.8767,10.3217 19.6699,10.5059L17.9922,12L19.6699,13.4941C19.8767,13.6783 20,13.9481 20,14.25C20,14.6922 19.6994,15 19.3105,15C18.9167,15 18.562,14.888 17.7422,14.2031C17.2327,13.7775 16.3693,12.8091 15.6113,11.998C16.3686,11.187 17.2329,10.22 17.7402,9.793C18.5572,9.1054 18.9046,9 19.25,9zM12,12.8203C8.7,15.8203 7,17.3605 7,19.3105C7,20.8105 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.3905,22 14.3105,22C15.8105,22 17,20.75 17,19.25C17,17.36 15.3,15.8203 12,12.8203zM12.002,15.6035C12.813,16.3628 13.7798,17.23 14.207,17.7383C14.8952,18.5569 15,18.9046 15,19.25C15,19.6922 14.6994,20 14.3105,20C13.9123,20 13.6783,19.8767 13.4941,19.6699L12,17.9922L10.5059,19.6699C10.3217,19.8767 10.0519,20 9.75,20C9.3078,20 9,19.6994 9,19.3105C9,18.9167 9.1133,18.5618 9.7988,17.7402C10.2246,17.2299 11.1911,16.3633 12.002,15.6035z" />
+</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 f2e6152d..00000000
--- 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.xml b/app/src/main/res/drawable/ic_more_messages.xml
new file mode 100644
index 00000000..20c54e01
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_messages.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="M22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6zM20,6l-8,5 -8,-5h16zM20,18L4,18L4,8l8,5 8,-5v10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_messages_24dp.xml b/app/src/main/res/drawable/ic_more_messages_24dp.xml
deleted file mode 100644
index 65f32169..00000000
--- a/app/src/main/res/drawable/ic_more_messages_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        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 150ced43..6adeb6cf 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 00000000..47ba29cb
--- /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="M2,2V11C2,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,11V2H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H2M4,4H6V6L6,11H4V4M18,4H20V11H18V6L18,4M8,6H16V11.5C16,13.43 15.42,15 12,15C8.59,15 8,13.43 8,11.5V6Z" />
+</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 00000000..334eb11f
--- /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.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_settings_24dp.xml b/app/src/main/res/drawable/ic_more_settings_24dp.xml
deleted file mode 100644
index fc12cdcf..00000000
--- 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_send_message_24dp.xml b/app/src/main/res/drawable/ic_send_message_24dp.xml
deleted file mode 100644
index 0d82394b..00000000
--- a/app/src/main/res/drawable/ic_send_message_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="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_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 01eee893..4055623a 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 64812f15..2cf46d1d 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 70c06ce8..84007c77 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 00b0e77c..f59dcabd 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 192776e6..548b8604 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 9469aae1..f2ee0bca 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 fe680d68..22268aac 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 904d04eb..ec25f6a4 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 1f25195c..8e46dc4f 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 7a670878..f95b9cfd 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:attr/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 fdfabc6f..7ed9b795 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 161eb4c5..47d6219a 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 c514205a..7b128605 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 e04683f8..0393e56a 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 1cb65026..d94912fa 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 00000000..556bdfd0
--- /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 4627ffd1..033a6772 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,24 @@
         </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: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 +81,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 5d03c2f4..31be9900 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -10,19 +10,18 @@
         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: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 +34,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 +49,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 +64,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 5dbd2c79..23086bfb 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,24 @@
         </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: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 +81,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 bf805175..d134ec17 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -5,16 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <io.github.wulkanowy.ui.modules.grade.CustomTabLayout
+    <io.github.wulkanowy.ui.widgets.FittedScrollableTabLayout
         android:id="@+id/gradeTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/colorPrimary"
-        android:elevation="5dp"
+        android:background="?colorSurface"
         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 +31,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 +47,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 610006e1..125d43a9 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 9c7f3795..49ae6682 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -6,24 +6,22 @@
     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: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 +29,7 @@
             android:paddingRight="30dp"
             android:paddingBottom="10dp"
             android:spinnerMode="dialog" />
-    </LinearLayout>
+    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -39,7 +37,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 +58,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 +66,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 +83,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 +103,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 +123,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 92a34f71..2d9e7dc6 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 a2e87bcc..b80727ec 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,24 @@
         </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: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 +81,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 00000000..80ecd6b1
--- /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 553c8726..5f6d2b5c 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 a94978bb..5d74d066 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 6c820889..6aab8b2e 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 b881f1bd..5d3afda2 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 78edbb03..7a2cfcf4 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,21 +1,24 @@
 <?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">
 
-    <com.google.android.material.tabs.TabLayout
+    <io.github.wulkanowy.ui.widgets.MaterialTabLayout
         android:id="@+id/messageTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:background="@color/colorPrimary"
-        android:elevation="5dp"
+        android:background="?colorSurface"
         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 +35,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 962d94ac..eedba669 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 31f1c8aa..d7f3e706 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 289cf2f4..b78dc067 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 bc70682f..41a9587d 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 72621b2f..85324961 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,24 @@
         </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: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 +81,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 381ae36c..dee31ae4 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,24 @@
         </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: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 +85,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 e5b5af3d..3a2e38c5 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 75e8388a..a83951dd 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:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        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:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        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 526e8150..207fcdb4 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 00000000..b5dc3758
--- /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 5f76dded..309be812 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,16 @@
     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"
+        tools:ignore="ContentDescription"
+        tools:tint="@color/colorPrimary" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/accountItemName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,10 +33,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 be54b91b..95a8f017 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:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        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 07392e56..b4946195 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 6e19a081..263c08a7 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 a437bf8c..68c9ab95 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
@@ -55,7 +57,7 @@
         android:layout_marginRight="40dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:attr/android:textColorSecondary"
+        android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
         tools:text="@tools:sample/lorem" />
 
@@ -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 801e1dea..459a7ecb 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 36632d04..d6d99d9b 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 b08c8780..a3a49ab6 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 4e90a582..5d03ed58 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 00000000..6a864433
--- /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 f896d99f..254bff60 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 e7322afa..ad914130 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"
@@ -45,8 +45,7 @@
         android:layout_marginTop="5dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:attr/android:textColorSecondary"
+        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 97245f97..95159d9b 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 07eb3344..6a941b96 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:attr/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 76fb6a8c..a5d3e362 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 6afc4153..0072524a 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:attr/android:textColorSecondary"
-        android:textSize="12sp" />
+        android:textColor="?android:textColorSecondary"
+        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:attr/android:textColorSecondary"
+        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 aa808864..bffc0bd5 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 00000000..9b7bb732
--- /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 37bbb32b..94de1107 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 cb28d43e..ec069f8c 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 026ac953..ec12e421 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 52469699..aa2269ad 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 94baf338..86c2fed7 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 fdc1dbd0..4438309d 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 93890829..6f8a1aea 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 7acc58c1..78b4ee4a 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 c3272aa2..f7979780 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 d512fc76..491f74f9 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 0a13494a..cfbdb626 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 7353dbd1..d59ec8e1 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 7353dbd1..d59ec8e1 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 31a48159..00000000
--- 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 342329dc..02309830 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,35 +1,17 @@
 <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: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 91d980a6..59bdb75a 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-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..6b7c7890
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/darker_gray</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:navigationBarColor">@color/colorPrimaryDark</item>
+    </style>
+</resources>
\ No newline at end of file
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 00000000..d33f6422
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/darker_gray</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: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 eef7eab4..accd3f80 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 1b1fc7a0..f7accebf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,24 +1,26 @@
 <?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>
-    <color name="grade_blue">#2196F3</color>
-    <color name="grade_green">#8BC34A</color>
-    <color name="grade_purple">#7E57C2</color>
+    <color name="grade_red">#d43f3f</color>
+    <color name="grade_blue">#49a6f2</color>
+    <color name="grade_green">#a0c431</color>
+    <color name="grade_purple">#8b6bc2</color>
 
-    <color name="grade_material_six">#03a9f4</color>
+    <color name="grade_material_six">#3dbbf5</color>
     <color name="grade_material_five">#4caf50</color>
-    <color name="grade_material_four">#92c400</color>
-    <color name="grade_material_three">#ffa000</color>
-    <color name="grade_material_two">#ff5722</color>
-    <color name="grade_material_one">#d32f2f</color>
+    <color name="grade_material_four">#a0c431</color>
+    <color name="grade_material_three">#ffb940</color>
+    <color name="grade_material_two">#ff774d</color>
+    <color name="grade_material_one">#d43f3f</color>
     <color name="grade_material_default">#607d8b</color>
 
     <color name="grade_vulcan_six">#91b43c</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 9646c0b4..00000000
--- 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 fd94e5b6..8ebb4b84 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 58699c9e..c8b41a1a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,35 +1,15 @@
 <resources>
 
-    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
+
+    <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>
-    </style>
-
-    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/layer_splash_background</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:textColor">?android:textColorPrimary</item>
+        <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
@@ -37,15 +17,14 @@
         <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>
     </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 ccacfe9d..d762066a 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 943fb190..00000000
--- 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, ""))
-    }
-}
diff --git a/build.gradle b/build.gradle
index 9a08dc70..d1047e38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         mavenCentral()
         google()
@@ -9,10 +9,10 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.google.gms:google-services:4.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.google.gms:google-services:4.3.1'
         classpath "io.fabric.tools:gradle:1.31.0"
-        classpath "com.github.triplet.gradle:play-publisher:2.2.1"
+        classpath "com.github.triplet.gradle:play-publisher:2.3.0"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0"
     }
diff --git a/gradle.properties b/gradle.properties
index 24e69b6a..44e7e13b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,6 +13,7 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
+kapt.incremental.apt=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372aef..5c2d1cf0 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 791ac7a4..8d58bda4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Apr 18 00:26:43 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/gradlew b/gradlew
index 9d82f789..b0d6d0ab 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,42 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -60,6 +40,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282a..15e1ee37 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,100 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega