diff --git a/app/build.gradle b/app/build.gradle
index 66b90ef8..444a166b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,6 @@ android {
         versionName "0.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-        buildConfigField "String", "UPDATE_URL", "\"https://bitrise-redirector.herokuapp.com" +
-                "/v0.1/apps/daeff1893f3c8128/builds/" + "${getCurrentGitBranch()}" + "/artifacts/app-release-bitrise-signed.apk/info\""
         manifestPlaceholders = [
                 fabricApiKey: System.getenv("FABRIC_API_KEY") ?: "null"
         ]
@@ -106,20 +104,3 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'org.mockito:mockito-android:2.13.0'
 }
-
-static def getCurrentGitBranch() {
-    if (gitBranch() == "HEAD") {
-        return System.getenv("BITRISE_GIT_BRANCH")
-    }
-
-    return gitBranch()
-}
-
-static def gitBranch() {
-    def branch = "null"
-    def proc = "git rev-parse --abbrev-ref HEAD".execute()
-    proc.in.eachLine { line -> branch = line }
-    proc.err.eachLine { line -> println line }
-    proc.waitFor()
-    branch
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f5b89757..f1733681 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.github.wulkanowy"
+
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".WulkanowyApp"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -47,15 +46,6 @@
             </intent-filter>
         </service>
 
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="${fabricApiKey}" />
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
index 5065279a..4b8866ce 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.java
@@ -13,7 +13,6 @@ import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.utils.Log;
 import io.fabric.sdk.android.Fabric;
 import io.github.wulkanowy.data.RepositoryContract;
-import io.github.wulkanowy.data.db.dao.entities.DaoSession;
 import io.github.wulkanowy.di.component.ApplicationComponent;
 import io.github.wulkanowy.di.component.DaggerApplicationComponent;
 import io.github.wulkanowy.di.modules.ApplicationModule;
@@ -34,15 +33,10 @@ public class WulkanowyApp extends Application {
                 .build();
         applicationComponent.inject(this);
 
-        initializeFabric();
         if (BuildConfig.DEBUG) {
             enableDebugLog();
         }
-
-    }
-
-    public ApplicationComponent getApplicationComponent() {
-        return applicationComponent;
+        initializeFabric();
     }
 
     private void enableDebugLog() {
@@ -59,7 +53,7 @@ public class WulkanowyApp extends Application {
                 .build());
     }
 
-    public DaoSession getDaoSession() {
-        return null;
+    public ApplicationComponent getApplicationComponent() {
+        return applicationComponent;
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/SyncJob.java b/app/src/main/java/io/github/wulkanowy/services/SyncJob.java
index fad3025e..ab26fcee 100644
--- a/app/src/main/java/io/github/wulkanowy/services/SyncJob.java
+++ b/app/src/main/java/io/github/wulkanowy/services/SyncJob.java
@@ -83,7 +83,7 @@ public class SyncJob extends SimpleJobService {
         service.notify(service.notificationBuilder()
                 .setContentTitle(getStringTitle())
                 .setContentText(getStringContent())
-                .setSmallIcon(R.drawable.ic_notification)
+                .setSmallIcon(R.drawable.ic_stat_notify)
                 .setAutoCancel(true)
                 .setDefaults(NotificationCompat.DEFAULT_ALL)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java
index 6ad696d0..d4c0b9da 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java
@@ -104,28 +104,28 @@ public class MainActivity extends BaseActivity implements MainContract.View,
     private void initiationBottomNav() {
         bottomNavigation.addItem(new AHBottomNavigationItem(
                 getString(R.string.grades_text),
-                getResources().getDrawable(R.drawable.icon_grade_26dp)
+                getResources().getDrawable(R.drawable.ic_menu_grade_26dp)
         ));
         bottomNavigation.addItem(new AHBottomNavigationItem(
                 getString(R.string.attendance_text),
-                getResources().getDrawable(R.drawable.icon_attendance_24dp)
+                getResources().getDrawable(R.drawable.ic_menu_attendance_24dp)
         ));
         bottomNavigation.addItem(new AHBottomNavigationItem(
                 getString(R.string.dashboard_text),
-                getResources().getDrawable(R.drawable.ic_dashboard_black_24dp)
+                getResources().getDrawable(R.drawable.ic_menu_dashboard_24dp)
         ));
         bottomNavigation.addItem(new AHBottomNavigationItem(
                 getString(R.string.lessonplan_text),
-                getResources().getDrawable(R.drawable.icon_lessonplan_24dp)
+                getResources().getDrawable(R.drawable.ic_menu_timetable_24dp)
         ));
         bottomNavigation.addItem(new AHBottomNavigationItem(
                 getString(R.string.settings_text),
-                getResources().getDrawable(R.drawable.icon_other_24dp)
+                getResources().getDrawable(R.drawable.ic_menu_other_24dp)
         ));
 
         bottomNavigation.setAccentColor(getResources().getColor(R.color.colorPrimary));
         bottomNavigation.setInactiveColor(Color.BLACK);
-        bottomNavigation.setBackgroundColor(getResources().getColor(R.color.colorBackgroundBottomNavi));
+        bottomNavigation.setBackgroundColor(getResources().getColor(R.color.colorBackgroundBottomNav));
         bottomNavigation.setTitleState(AHBottomNavigation.TitleState.ALWAYS_SHOW);
         bottomNavigation.setOnTabSelectedListener(this);
         bottomNavigation.setCurrentItem(initTabPosition);
diff --git a/app/src/main/res/color/bottomnavi_color.xml b/app/src/main/res/color/bottomnavi_color.xml
deleted file mode 100644
index e874a6ac..00000000
--- a/app/src/main/res/color/bottomnavi_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorPrimary" android:state_checked="true" />
-    <item android:color="#000000" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_stat_notify.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_notification.png
rename to app/src/main/res/drawable-hdpi/ic_stat_notify.png
diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_stat_notify.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_notification.png
rename to app/src/main/res/drawable-mdpi/ic_stat_notify.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_notification.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_notify.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_notification.png
rename to app/src/main/res/drawable-xxhdpi/ic_stat_notify.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_notification.png
rename to app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png
diff --git a/app/src/main/res/drawable/ic_alert_24dp.xml b/app/src/main/res/drawable/ic_alert_24dp.xml
new file mode 100644
index 00000000..1c41b556
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alert_24dp.xml
@@ -0,0 +1,10 @@
+<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="@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" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/subject_border_1px.xml b/app/src/main/res/drawable/ic_border.xml
similarity index 100%
rename from app/src/main/res/drawable/subject_border_1px.xml
rename to app/src/main/res/drawable/ic_border.xml
diff --git a/app/src/main/res/drawable/ic_exclamation_24dp.xml b/app/src/main/res/drawable/ic_exclamation_24dp.xml
new file mode 100644
index 00000000..4d3c91cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_exclamation_24dp.xml
@@ -0,0 +1,10 @@
+<!-- drawable/exclamation.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="@color/colorPrimary"
+        android:pathData="M11 5h2v11h-2V5m2 13v2h-2v-2h2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_generic_exclamation.xml b/app/src/main/res/drawable/ic_generic_exclamation.xml
deleted file mode 100644
index c7159e31..00000000
--- a/app/src/main/res/drawable/ic_generic_exclamation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/exclamation.xml -->
-<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="@color/colorPrimary" android:pathData="M11,4.5H13V15.5H11V4.5M13,17.5V19.5H11V17.5H13Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 024480e9..c5ecc747 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,13 +1,17 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="51.67464"
-    android:viewportHeight="51.67464">
+    android:viewportHeight="51.67464"
+    android:viewportWidth="51.67464">
     <group
         android:translateX="13.83732"
         android:translateY="13.83732">
         <path
             android:fillColor="#FF000000"
-            android:pathData="M10.545,11h-2.215c-0.158,-1.234 -0.428,-1.971 -2.092,-2.691 -1.38,-0.598 -2.238,-1.83 -2.238,-3.218 0,-2.021 1.652,-3.317 3.286,-3.459 0.625,-0.999 1.731,-1.632 2.94,-1.632 0.877,0 1.697,0.325 2.323,0.892 0.793,-0.576 1.747,-0.892 2.743,-0.892 2.596,0 4.708,2.1 4.708,4.682s-2.112,4.682 -4.708,4.682c-0.606,0 -1.165,-0.129 -1.658,-0.242 -1.001,-0.231 -2.327,-0.563 -3.089,1.878zM6.012,5.091c0,0.871 0.788,1.279 1.029,1.384 0.84,0.364 1.926,0.834 2.609,2.102 0.815,-1.108 1.755,-1.632 2.904,-1.632 0.858,0 2.083,0.419 2.737,0.419 1.487,0 2.697,-1.203 2.697,-2.682 0,-2.79 -3.694,-3.635 -5.517,-1.166 -0.707,-2.031 -3.865,-1.937 -3.887,0.219 -0.67,-0.61 -2.572,-0.331 -2.572,1.356zM17,14l-2.154,3 -3.846,-5c-0.364,0.316 -0.932,0.474 -1.5,0.474s-1.136,-0.158 -1.5,-0.474l-8,12h24l-7,-10zM7.005,17.097l1.12,0.903 1.5,-1.604 1.667,1.604 1.083,-0.933 2.527,3.285 2.078,-2.894 3.179,4.542h-16.422l3.268,-4.903z" />
+            android:pathData="M10.5 11H8.3c-0.1-1.2-0.4-2-2-2.7A3.5 3.5 0 0 1 4 5.1c0-2 1.7-3.3 3.3-3.5a3.5
+                3.5 0 0 1 5.2-0.7c0.8-0.6 1.8-0.9 2.8-0.9a4.7 4.7 0 1 1 0 9.4c-0.6 0-1.2-0.2-1.7-0.3-1-0.2-2.3-0.5-3
+                1.9zM6 5c0 1 0.8 1.4 1 1.5 0.9 0.3 2 0.8 2.6 2 0.9-1 1.8-1.6 3-1.6 0.8 0 2 0.5 2.7 0.5 1.5
+                0 2.7-1.2 2.7-2.7 0-2.8-3.7-3.7-5.5-1.2-0.7-2-3.9-2-4 0.2C8 3.1 6 3.4 6 5.1zm11 9l-2.2 3-3.8-5c-0.4 0.3-1
+                0.5-1.5 0.5S8.4 12.3 8 12L0 24h24l-7-10zM7 17.1l1.1 0.9 1.5-1.6 1.7 1.6 1-1 2.6 3.4 2-3 3.3 4.6H3.7L7 17.1z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_attendance_24dp.xml b/app/src/main/res/drawable/ic_menu_attendance_24dp.xml
new file mode 100644
index 00000000..fdef7322
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_attendance_24dp.xml
@@ -0,0 +1,12 @@
+<!-- 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="#ffffff"
+        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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_menu_dashboard_24dp.xml
similarity index 69%
rename from app/src/main/res/drawable/ic_dashboard_black_24dp.xml
rename to app/src/main/res/drawable/ic_menu_dashboard_24dp.xml
index f0d02f4f..50726abd 100644
--- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_dashboard_24dp.xml
@@ -5,5 +5,5 @@
     android:viewportWidth="24.0">
     <path
         android:fillColor="#ffffff"
-        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
+        android:pathData="M3 13h8V3H3v10zm0 8h8v-6H3v6zm10 0h8V11h-8v10zm0-18v6h8V3h-8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_grade_26dp.xml b/app/src/main/res/drawable/ic_menu_grade_26dp.xml
new file mode 100644
index 00000000..61506dad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_grade_26dp.xml
@@ -0,0 +1,11 @@
+<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="#FFF"
+        android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2
+            2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2
+            2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_menu_other_24dp.xml b/app/src/main/res/drawable/ic_menu_other_24dp.xml
new file mode 100644
index 00000000..9fed586b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_other_24dp.xml
@@ -0,0 +1,16 @@
+<!-- drawable/settings.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="#ffffff"
+        android:pathData="M19.4 13l 0.1-1-0.1-1 2.1-1.5c 0.2-0.1 0.3-0.4 0.1-0.7l-2-3.5c-0.1-0.3-0.4
+            -0.4-0.6-0.3l-2.4 1.1c-0.5-0.4-1.2-0.8-1.8-1l-0.3-2.6c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3 0-0.5
+            0.2-0.5 0.5L9.2 5c-0.7 0.3-1.3 0.6-1.8 1L5 5a 0.5 0.5 0 0 0-0.6 0.2l-2 3.5c-0.2 0.3-0.2 0.6
+            0.1 0.7L4.6 11l-0.1 1 0.1 1-2.1 1.5c-0.2 0.1-0.3 0.4-0.1 0.7l2 3.5c 0.1 0.3 0.4 0.4 0.6
+            0.3l2.4-1.1c 0.5 0.4 1.2 0.8 1.8 1l 0.3 2.6c0 0.3 0.2 0.5 0.5 0.5h4c 0.3 0 0.5-0.2 0.5-0.5l
+            0.3-2.6c 0.7-0.3 1.3-0.6 1.8-1L19 19c 0.2 0.1 0.5 0 0.6-0.2l2-3.5c 0.1-0.2 0.1-0.5-0.1-0.7L19.4
+            13zM12 16a4 4 0 0 1-4-4c0-2.2 1.8-4 4-4s4 1.8 4 4a4 4 0 0 1-4 4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_menu_timetable_24dp.xml b/app/src/main/res/drawable/ic_menu_timetable_24dp.xml
new file mode 100644
index 00000000..a689dc06
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_timetable_24dp.xml
@@ -0,0 +1,11 @@
+<!-- drawable/calendar_text.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="#ffffff"
+        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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_swap_30dp.xml b/app/src/main/res/drawable/ic_swap_30dp.xml
new file mode 100644
index 00000000..01eee893
--- /dev/null
+++ b/app/src/main/res/drawable/ic_swap_30dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/colorPrimary"
+        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_timetable_swap.xml b/app/src/main/res/drawable/ic_timetable_swap.xml
deleted file mode 100644
index 81455485..00000000
--- a/app/src/main/res/drawable/ic_timetable_swap.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="30dp"
-        android:height="30dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"
-        android:fillColor="@color/colorPrimary"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_wrench_24dp.xml b/app/src/main/res/drawable/ic_wrench_24dp.xml
new file mode 100644
index 00000000..8f3a86fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wrench_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+        android:pathData="M6 2l4 4-1 3-3 1-4-4c0 2 0 5 2 7 3 2 6 0 7 1l6 7h4v-4l-7-6c-1-1
+            1-4-1-7-2-2-5-2-7-2zm14 17l-1 1-1-1 1-1 1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_wrench_construction.xml b/app/src/main/res/drawable/ic_wrench_construction.xml
deleted file mode 100644
index 6b9f6efc..00000000
--- a/app/src/main/res/drawable/ic_wrench_construction.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#000000"
-        android:pathData="M 5.898438 2.199219 L 10 6.300781 C 10 6.300781 10 7.5 8.800781 8.800781 C 7.5
-10 6.300781 10 6.300781 10 L 2.199219 5.898438 C 1.601563 8.199219 2.398438 11
-4.101563 12.699219 C 6.699219 15.300781 9.898438 13 10.601563 13.699219 C
-14.199219 17.300781 17.101563 21 17.300781 21.199219 C 18.398438 22.300781
-20.199219 22.300781 21.199219 21.300781 C 22.300781 20.199219 22.199219 18.5
-21.101563 17.398438 C 21 17.300781 17.101563 14.199219 13.5 10.601563 C
-12.800781 9.898438 15.300781 6.800781 12.601563 4.101563 C 11 2.398438 8.199219
-1.601563 5.898438 2.199219 Z M 20.199219 19 C 20.199219 19.699219 19.699219
-20.199219 19 20.199219 C 18.300781 20.199219 17.800781 19.699219 17.800781 19 C
-17.800781 18.300781 18.300781 17.800781 19 17.800781 C 19.699219 17.800781
-20.199219 18.300781 20.199219 19 Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_attendance_24dp.xml b/app/src/main/res/drawable/icon_attendance_24dp.xml
deleted file mode 100644
index fcdf36b8..00000000
--- a/app/src/main/res/drawable/icon_attendance_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/table_edit.xml -->
-<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="#ffffff" android:pathData="M21.7,13.35L20.7,14.35L18.65,12.3L19.65,11.3C19.86,11.08 20.21,11.08 20.42,11.3L21.7,12.58C21.92,12.79 21.92,13.14 21.7,13.35M12,18.94L18.07,12.88L20.12,14.93L14.06,21H12V18.94M4,2H18A2,2 0 0,1 20,4V8.17L16.17,12H12V16.17L10.17,18H4A2,2 0 0,1 2,16V4A2,2 0 0,1 4,2M4,6V10H10V6H4M12,6V10H18V6H12M4,12V16H10V12H4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_grade_26dp.xml b/app/src/main/res/drawable/icon_grade_26dp.xml
deleted file mode 100644
index 13f24206..00000000
--- a/app/src/main/res/drawable/icon_grade_26dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- drawable/numeric_6_box_multiple_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportWidth="26"
-    android:viewportHeight="26">
-    <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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_lessonplan_24dp.xml b/app/src/main/res/drawable/icon_lessonplan_24dp.xml
deleted file mode 100644
index fa4870c8..00000000
--- a/app/src/main/res/drawable/icon_lessonplan_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/calendar_text.xml -->
-<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="#ffffff" android:pathData="M14,14H7V16H14M19,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,3M17,10H7V12H17V10Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_other_24dp.xml b/app/src/main/res/drawable/icon_other_24dp.xml
deleted file mode 100644
index 67173d90..00000000
--- a/app/src/main/res/drawable/icon_other_24dp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- drawable/settings.xml -->
-<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="#ffffff"
-        android:pathData="M19.4,13c0-0.3,0.1-0.7,0.1-1s0-0.7-0.1-1l2.1-1.5c0.2-0.1,0.3-0.4,0.1-0.7l-2-3.5C19.5,5,19.2,4.9,19,5l-2.4,1.1
-    c-0.5-0.4-1.2-0.8-1.8-1l-0.3-2.6C14.5,2.2,14.3,2,14,2H10C9.7,2,9.5,2.2,9.5,2.5L9.2,5c-0.7,0.3-1.3,0.6-1.8,1L5,5
-     C4.8,4.9,4.5,5,4.4,5.2l-2,3.5C2.2,9,2.2,9.3,2.5,9.4L4.6,11c0,0.3-0.1,0.7-0.1,1s0,0.7,0.1,1l-2.1,1.5c-0.2,0.1-0.3,0.4-0.1,0.7
-    l2,3.5C4.5,19,4.8,19.1,5,19l2.4-1.1c0.5,0.4,1.2,0.8,1.8,1l0.3,2.6c0,0.3,0.2,0.5,0.5,0.5H14c0.3,0,0.5-0.2,0.5-0.5l0.3-2.6
-    c0.7-0.3,1.3-0.6,1.8-1L19,19c0.2,0.1,0.5,0,0.6-0.2l2-3.5c0.1-0.2,0.1-0.5-0.1-0.7L19.4,13z M12,16c-2.2,0-4-1.8-4-4
-    c0-2.2,1.8-4,4-4s4,1.8,4,4C16,14.2,14.2,16,12,16z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/subject_alert_circle.xml b/app/src/main/res/drawable/subject_alert_circle.xml
deleted file mode 100644
index 92f7cd3b..00000000
--- a/app/src/main/res/drawable/subject_alert_circle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@color/colorPrimary"
-        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index dc270277..6df75c8e 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -20,7 +20,7 @@
             android:contentDescription="@string/activity_dashboard_text"
             android:minHeight="100dp"
             android:minWidth="100dp"
-            app:srcCompat="@drawable/ic_wrench_construction" />
+            app:srcCompat="@drawable/ic_wrench_24dp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_board.xml b/app/src/main/res/layout/fragment_board.xml
index 714fc724..5ac9685a 100644
--- a/app/src/main/res/layout/fragment_board.xml
+++ b/app/src/main/res/layout/fragment_board.xml
@@ -20,7 +20,7 @@
             android:contentDescription="@string/activity_dashboard_text"
             android:minHeight="100dp"
             android:minWidth="100dp"
-            app:srcCompat="@drawable/ic_wrench_construction" />
+            app:srcCompat="@drawable/ic_wrench_24dp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index d5acf7b5..b95b1f7b 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -23,7 +23,7 @@
             android:minHeight="100dp"
             android:minWidth="100dp"
             android:tint="@android:color/black"
-            app:srcCompat="@drawable/icon_grade_26dp" />
+            app:srcCompat="@drawable/ic_menu_grade_26dp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/grade_header.xml b/app/src/main/res/layout/grade_header.xml
index a56c95db..01690a16 100644
--- a/app/src/main/res/layout/grade_header.xml
+++ b/app/src/main/res/layout/grade_header.xml
@@ -4,9 +4,12 @@
     android:id="@+id/grade_header_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/subject_border_1px"
+    android:background="@drawable/ic_border"
     android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:padding="15dp">
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <TextView
         android:id="@+id/grade_header_subject_text"
@@ -50,6 +53,6 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/subject_alert_circle"
+        app:srcCompat="@drawable/ic_alert_24dp"
         tool:ignore="contentDescription" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/grade_subitem.xml b/app/src/main/res/layout/grade_subitem.xml
index 14131835..86ddddc7 100644
--- a/app/src/main/res/layout/grade_subitem.xml
+++ b/app/src/main/res/layout/grade_subitem.xml
@@ -66,7 +66,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_marginTop="10dp"
-            app:srcCompat="@drawable/subject_alert_circle"
+            app:srcCompat="@drawable/ic_alert_24dp"
             tool:ignore="contentDescription" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/timetable_header.xml b/app/src/main/res/layout/timetable_header.xml
index 80b0fb1a..d9e3639d 100644
--- a/app/src/main/res/layout/timetable_header.xml
+++ b/app/src/main/res/layout/timetable_header.xml
@@ -3,9 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/subject_border_1px"
+    android:background="@drawable/ic_border"
     android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:padding="15dp">
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <TextView
         android:id="@+id/timetable_header_day"
@@ -42,7 +45,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_generic_exclamation"
+        app:srcCompat="@drawable/ic_exclamation_24dp"
         tools:ignore="contentDescription" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_subitem.xml b/app/src/main/res/layout/timetable_subitem.xml
index 7512a679..ceb867a4 100644
--- a/app/src/main/res/layout/timetable_subitem.xml
+++ b/app/src/main/res/layout/timetable_subitem.xml
@@ -88,7 +88,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_marginTop="10dp"
-            app:srcCompat="@drawable/ic_timetable_swap"
+            app:srcCompat="@drawable/ic_swap_30dp"
             tool:ignore="contentDescription"/>
 
     </RelativeLayout>
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
deleted file mode 100644
index a4400280..00000000
--- a/app/src/main/res/menu/navigation.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/navigation_marks"
-        android:icon="@drawable/icon_grade_26dp"
-        android:title="@string/grades_text" />
-
-    <item
-        android:id="@+id/navigation_attendance"
-        android:icon="@drawable/icon_attendance_24dp"
-        android:title="@string/attendance_text" />
-
-    <item
-        android:id="@+id/navigation_dashboard"
-        android:icon="@drawable/ic_dashboard_black_24dp"
-        android:title="@string/dashboard_text" />
-
-    <item
-        android:id="@+id/navigation_lessonplan"
-        android:icon="@drawable/icon_lessonplan_24dp"
-        android:title="@string/lessonplan_text" />
-
-    <item
-        android:id="@+id/navigation_settings"
-        android:icon="@drawable/icon_other_24dp"
-        android:title="@string/settings_text" />
-
-</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 ac94b34f..50b67d67 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" />
+    <background android:drawable="@android:color/white" />
     <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 ac94b34f..50b67d67 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" />
+    <background android:drawable="@android:color/white" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f48e33c6..a34531d4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="colorPrimary">#d32f2f</color>
     <color name="colorPrimaryDark">#9a0007</color>
     <color name="colorPrimaryLight">#ff6659</color>
-    <color name="colorBackgroundBottomNavi">#f0f0f0</color>
+    <color name="colorBackgroundBottomNav">#f0f0f0</color>
     <color name="six_grade">#92b53d</color>
     <color name="five_grade">#66B266</color>
     <color name="four_grade">#55BBDB</color>
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 c5d5899f..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">#FFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/identificators.xml b/app/src/main/res/values/identificators.xml
new file mode 100644
index 00000000..fa7b1f19
--- /dev/null
+++ b/app/src/main/res/values/identificators.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="visible" type="id" />
+    <item name="masked" type="id" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000..f7579446
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include
+        domain="sharedpref"
+        path="." />
+    <include
+        domain="database"
+        path="." />
+</full-backup-content>
\ No newline at end of file
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
deleted file mode 100644
index 3dd0ebff..00000000
--- a/app/src/main/res/xml/provider_paths.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <external-path
-        name="external_files"
-        path="." />
-    <external-path
-        name="external_storage_root"
-        path="." />
-    <external-path
-        name="files_root"
-        path="Android/data/io.github.wulkanowy" />
-</paths>
diff --git a/build.gradle b/build.gradle
index 6692497e..13b22854 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,8 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://maven.google.com' }
         google()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -36,8 +35,6 @@ allprojects {
     repositories {
         jcenter()
         mavenCentral()
-        maven { url 'https://maven.google.com' }
-        maven { url "https://jitpack.io" }
         google()
     }
 }