diff --git a/app/build.gradle b/app/build.gradle
index f146d6c8..f9adae64 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,7 +128,7 @@ dependencies {
     // Iconics & related
     implementation "com.mikepenz:iconics-core:5.2.8"
     implementation "com.mikepenz:iconics-views:5.2.8"
-    implementation "com.mikepenz:community-material-typeface:3.5.95.1-kotlin@aar"
+    implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar"
     implementation "eu.szkolny:szkolny-font:1dab7d64ed"
 
     // Other dependencies
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 099763d2..de9b5f85 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -152,7 +152,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     .withPopToHome(false)
 
             list += NavTarget(DRAWER_ITEM_TIMETABLE, R.string.menu_timetable, TimetableFragment::class)
-                    .withIcon(CommunityMaterial.Icon2.cmd_timetable)
+                    .withIcon(CommunityMaterial.Icon3.cmd_timetable)
                     .withBadgeTypeId(TYPE_LESSON_CHANGE)
                     .isInDrawer(true)
 
@@ -162,7 +162,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     .isInDrawer(true)
 
             list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesListFragment::class)
-                    .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline)
+                    .withIcon(CommunityMaterial.Icon3.cmd_numeric_5_box_outline)
                     .withBadgeTypeId(TYPE_GRADE)
                     .isInDrawer(true)
 
@@ -200,7 +200,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     .isBelowSeparator(true)
 
             list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsNewFragment::class)
-                    .withIcon(CommunityMaterial.Icon2.cmd_settings_outline)
+                    .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
                     .isInDrawer(true)
                     .isStatic(true)
                     .isBelowSeparator(true)
@@ -208,7 +208,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
             // profile settings items
             list += NavTarget(DRAWER_PROFILE_ADD_NEW, R.string.menu_add_new_profile, null)
-                    .withIcon(CommunityMaterial.Icon2.cmd_plus)
+                    .withIcon(CommunityMaterial.Icon3.cmd_plus)
                     .withDescription(R.string.drawer_add_new_profile_desc)
                     .isInProfileList(true)
 
@@ -237,7 +237,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             if (App.devMode) {
                 list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
                 list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class)
-                        .withIcon(CommunityMaterial.Icon.cmd_flask_outline)
+                        .withIcon(CommunityMaterial.Icon2.cmd_flask_outline)
                         .isInDrawer(true)
                         .isBelowSeparator(true)
                         .isStatic(true)
@@ -520,7 +520,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 CafeBar.builder(this)
                         .content(R.string.rate_snackbar_text)
                         .icon(IconicsDrawable(this).apply {
-                            icon = CommunityMaterial.Icon2.cmd_star_outline
+                            icon = CommunityMaterial.Icon3.cmd_star_outline
                             sizeDp = 20
                             colorInt = Themes.getPrimaryTextColor(this@MainActivity)
                         })
@@ -565,7 +565,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 BottomSheetSeparatorItem(false),
                 BottomSheetPrimaryItem(false)
                         .withTitle(R.string.menu_settings)
-                        .withIcon(CommunityMaterial.Icon2.cmd_settings_outline)
+                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
                         .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_SETTINGS) }),
                 BottomSheetPrimaryItem(false)
                         .withTitle(R.string.menu_feedback)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt
index 35750f43..367b00da 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt
@@ -18,7 +18,6 @@ import com.github.tibolte.agendacalendarview.models.CalendarEvent
 import com.github.tibolte.agendacalendarview.models.IDayItem
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
 import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizeDp
 import eu.szkolny.font.SzkolnyFont
@@ -89,7 +88,7 @@ class AgendaFragment : Fragment(), CoroutineScope {
                         }),
                 BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_agenda_change_view)
-                        .withIcon(if (type == Profile.AGENDA_DEFAULT) CommunityMaterial.Icon.cmd_calendar_outline else CommunityMaterial.Icon.cmd_format_list_bulleted_square)
+                        .withIcon(if (type == Profile.AGENDA_DEFAULT) CommunityMaterial.Icon.cmd_calendar_outline else CommunityMaterial.Icon2.cmd_format_list_bulleted_square)
                         .withOnClickListener(View.OnClickListener {
                             activity.bottomSheet.close()
                             type = if (type == Profile.AGENDA_DEFAULT) Profile.AGENDA_CALENDAR else Profile.AGENDA_DEFAULT
@@ -111,7 +110,7 @@ class AgendaFragment : Fragment(), CoroutineScope {
 
         activity.navView.bottomBar.fabEnable = true
         activity.navView.bottomBar.fabExtendedText = getString(R.string.add)
-        activity.navView.bottomBar.fabIcon = Icon2.cmd_plus
+        activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon3.cmd_plus
         activity.navView.setFabOnClickListener(View.OnClickListener {
             EventManualDialog(activity, app.profileId, defaultDate = actualDate)
         })
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt
index 0af177f9..194f36d2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt
@@ -60,7 +60,7 @@ class AttendanceFragment : Fragment(), CoroutineScope {
         activity.bottomSheet.prependItems(
                 BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_attendance_config)
-                        .withIcon(CommunityMaterial.Icon2.cmd_settings_outline)
+                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
                         .withOnClickListener(View.OnClickListener {
                             activity.bottomSheet.close()
                             AttendanceConfigDialog(activity, true, null, null)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
index 93f21191..a3288da2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
@@ -50,7 +50,7 @@ class NoticesAdapter//getting the context and product list with constructor
 
         if (notice.type == Notice.TYPE_POSITIVE) {
             holder.noticesItemType.setImageDrawable(
-                IconicsDrawable(context, CommunityMaterial.Icon2.cmd_plus_circle_outline).apply {
+                IconicsDrawable(context, CommunityMaterial.Icon3.cmd_plus_circle_outline).apply {
                     colorRes = R.color.md_green_600
                     sizeDp = 36
                 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
index 33d69c60..eb7fdcb1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
@@ -15,7 +15,6 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
 import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.MainActivity.Companion.TARGET_GRADES_EDITOR
@@ -71,7 +70,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
         val adapter = GradesAdapter(activity)
         var firstRun = true
 
-        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this@GradesListFragment, Observer { grades -> this@GradesListFragment.launch {
+        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(viewLifecycleOwner, Observer { grades -> this@GradesListFragment.launch {
             if (!isAdded) return@launch
 
             val items = when {
@@ -135,7 +134,7 @@ class GradesListFragment : Fragment(), CoroutineScope {
         activity.bottomSheet.prependItems(
                 BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_grades_config)
-                        .withIcon(Icon2.cmd_settings_outline)
+                        .withIcon(CommunityMaterial.Icon.cmd_cog_outline)
                         .withOnClickListener(View.OnClickListener {
                             activity.bottomSheet.close()
                             GradesConfigDialog(activity, true, null, null)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
index a530eefc..a2e4f9d7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
@@ -88,7 +88,7 @@ class HomeTimetableCard(
         holder.root += b.root
 
         b.settings.setImageDrawable(
-            IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_settings_outline).apply {
+            IconicsDrawable(activity, CommunityMaterial.Icon.cmd_cog_outline).apply {
                 colorAttr(activity, R.attr.colorIcon)
                 sizeDp = 20
             }
@@ -102,7 +102,7 @@ class HomeTimetableCard(
         )
 
         b.showCounter.setImageDrawable(
-            IconicsDrawable(activity, CommunityMaterial.Icon.cmd_fullscreen).apply {
+            IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_fullscreen).apply {
                 colorAttr(activity, R.attr.colorIcon)
                 sizeDp = 20
             }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
index f757570a..c8a62def 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
@@ -100,7 +100,7 @@ class HomeworkFragment : Fragment(), CoroutineScope {
             bottomBar.apply {
                 fabEnable = true
                 fabExtendedText = getString(R.string.add)
-                fabIcon = CommunityMaterial.Icon2.cmd_plus
+                fabIcon = CommunityMaterial.Icon3.cmd_plus
             }
 
             setFabOnClickListener(View.OnClickListener {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
index 949848a5..77036f19 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
@@ -110,7 +110,7 @@ object LoginInfo {
                             FormField(
                                 keyName = "accountPin",
                                 name = R.string.login_hint_pin,
-                                icon = CommunityMaterial.Icon2.cmd_lock,
+                                icon = CommunityMaterial.Icon2.cmd_lock_outline,
                                 emptyText = R.string.login_error_no_pin,
                                 invalidText = R.string.login_error_incorrect_pin,
                                 errorCodes = mapOf(),
@@ -157,7 +157,7 @@ object LoginInfo {
                             FormField(
                                 keyName = "symbol",
                                 name = R.string.login_hint_symbol,
-                                icon = CommunityMaterial.Icon2.cmd_school,
+                                icon = CommunityMaterial.Icon3.cmd_school_outline,
                                 emptyText = R.string.login_error_no_symbol,
                                 invalidText = R.string.login_error_incorrect_symbol,
                                 errorCodes = mapOf(
@@ -170,7 +170,7 @@ object LoginInfo {
                             FormField(
                                 keyName = "devicePin",
                                 name = R.string.login_hint_pin,
-                                icon = CommunityMaterial.Icon2.cmd_lock,
+                                icon = CommunityMaterial.Icon2.cmd_lock_outline,
                                 emptyText = R.string.login_error_no_pin,
                                 invalidText = R.string.login_error_incorrect_pin,
                                 errorCodes = mapOf(
@@ -252,7 +252,7 @@ object LoginInfo {
                             FormField(
                                 keyName = "serverName",
                                 name = R.string.login_hint_address,
-                                icon = CommunityMaterial.Icon2.cmd_web,
+                                icon = CommunityMaterial.Icon3.cmd_web,
                                 emptyText = R.string.login_error_no_address,
                                 invalidText = R.string.login_error_incorrect_address,
                                 errorCodes = mapOf(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
index 19106004..2fcadf55 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
@@ -65,7 +65,7 @@ class MessageFragment : Fragment(), CoroutineScope {
         if (!isAdded) return
 
         b.closeButton.setImageDrawable(
-                IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_window_close).apply {
+                IconicsDrawable(activity, CommunityMaterial.Icon3.cmd_window_close).apply {
                     colorAttr(activity, android.R.attr.textColorSecondary)
                     sizeDp = 12
                 }
@@ -231,7 +231,7 @@ class MessageFragment : Fragment(), CoroutineScope {
                 bottomBar.apply {
                     fabEnable = true
                     fabExtendedText = getString(R.string.messages_reply)
-                    fabIcon = CommunityMaterial.Icon2.cmd_reply
+                    fabIcon = CommunityMaterial.Icon3.cmd_reply_outline
                 }
 
                 setFabOnClickListener(View.OnClickListener {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
index 043cce7d..add36a3c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
@@ -97,7 +97,7 @@ class MessagesFragment : Fragment(), CoroutineScope {
             bottomBar.apply {
                 fabEnable = true
                 fabExtendedText = getString(R.string.compose)
-                fabIcon = CommunityMaterial.Icon2.cmd_pencil_outline
+                fabIcon = CommunityMaterial.Icon3.cmd_pencil_outline
             }
 
             setFabOnClickListener(View.OnClickListener {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
index 96898871..942876f2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
@@ -316,7 +316,7 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
         activity.navView.bottomBar.apply {
             fabEnable = true
             fabExtendedText = getString(R.string.messages_compose_send)
-            fabIcon = CommunityMaterial.Icon2.cmd_send
+            fabIcon = CommunityMaterial.Icon3.cmd_send_outline
 
             setFabOnClickListener(View.OnClickListener {
                 sendMessage()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
index 3a6bffe4..d009cdf1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
@@ -239,7 +239,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     new MaterialAboutActionItem(
                             getString(R.string.settings_profile_notifications_text),
                             getString(R.string.settings_profile_notifications_subtext),
-                            icon(CommunityMaterial.Icon.cmd_filter_outline, iconSizeDp, iconColor)
+                            icon(CommunityMaterial.Icon2.cmd_filter_outline, iconSizeDp, iconColor)
                     )
                             .setOnClickAction(() -> {
                                 new NotificationFilterDialog(activity, null, null);
@@ -295,7 +295,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         new MaterialAboutSwitchItem.Builder()
                                 .text(R.string.settings_theme_snowfall_text)
                                 .subText(R.string.settings_theme_snowfall_subtext)
-                                .icon(icon(CommunityMaterial.Icon2.cmd_snowflake, iconSizeDp, iconColor))
+                                .icon(icon(CommunityMaterial.Icon3.cmd_snowflake, iconSizeDp, iconColor))
                         .setChecked(app.getConfig().getUi().getSnowfall())
                         .setOnCheckedChanged((item, isChecked) -> {
                             app.getConfig().getUi().setSnowfall(isChecked);
@@ -310,7 +310,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     new MaterialAboutActionItem(
                             getString(R.string.settings_theme_theme_text),
                             Themes.INSTANCE.getThemeName(activity),
-                            icon(CommunityMaterial.Icon2.cmd_palette_outline, iconSizeDp, iconColor)
+                            icon(CommunityMaterial.Icon3.cmd_palette_outline, iconSizeDp, iconColor)
                     )
                     .setOnClickAction(() -> {
                         new MaterialDialog.Builder(activity)
@@ -354,7 +354,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     new MaterialAboutActionItem(
                             getString(R.string.settings_theme_mini_drawer_buttons_text),
                             null,
-                            icon(CommunityMaterial.Icon.cmd_format_list_checks, iconSizeDp, iconColor)
+                            icon(CommunityMaterial.Icon2.cmd_format_list_checks, iconSizeDp, iconColor)
                     )
                     .setOnClickAction(() -> {
                         List<Integer> buttonIds = new ArrayList<>();
@@ -472,7 +472,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             items.add(
                     new MaterialAboutSwitchItem.Builder( )
                             .text(R.string.settings_theme_open_drawer_on_back_pressed_text)
-                            .icon(icon(CommunityMaterial.Icon2.cmd_menu_open, iconSizeDp, iconColor))
+                            .icon(icon(CommunityMaterial.Icon3.cmd_menu_open, iconSizeDp, iconColor))
                             .setChecked(app.getConfig().getUi().getOpenDrawerOnBackPressed())
                             .setOnCheckedChanged((item, isChecked) -> {
                                 app.getConfig().getUi().setOpenDrawerOnBackPressed(isChecked);
@@ -521,7 +521,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         return new MaterialAboutSwitchItem.Builder()
                 .text(R.string.settings_sync_wifi_text)
                 .subText(R.string.settings_sync_wifi_subtext)
-                .icon(icon(CommunityMaterial.Icon2.cmd_wifi_strength_2, iconSizeDp, iconColor))
+                .icon(icon(CommunityMaterial.Icon3.cmd_wifi_strength_2, iconSizeDp, iconColor))
         .setChecked(app.getConfig().getSync().getOnlyWifi())
         .setOnCheckedChanged((item, isChecked) -> {
             app.getConfig().getSync().setOnlyWifi(isChecked);
@@ -721,7 +721,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         new MaterialAboutActionItem(
                                 getString(R.string.settings_sync_notifications_settings_text),
                                 getString(R.string.settings_sync_notifications_settings_subtext),
-                                icon(CommunityMaterial.Icon2.cmd_settings_outline, iconSizeDp, iconColor)
+                                icon(CommunityMaterial.Icon.cmd_cog_outline, iconSizeDp, iconColor)
                         )
                         .setOnClickAction(() -> {
                             String channel = app.getNotificationChannelsManager().getData().getKey();
@@ -794,7 +794,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         return new MaterialAboutSwitchItem.Builder()
                 .text(R.string.settings_register_shared_events_text)
                 .subText(R.string.settings_register_shared_events_subtext)
-                .icon(icon(CommunityMaterial.Icon2.cmd_share_outline, iconSizeDp, iconColor))
+                .icon(icon(CommunityMaterial.Icon3.cmd_share_outline, iconSizeDp, iconColor))
         .setChecked(app.getProfile().getEnableSharedEvents())
         .setOnCheckedChanged((item, isChecked) -> {
             app.getProfile().setEnableSharedEvents(isChecked);
@@ -822,7 +822,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             items.add(new MaterialAboutActionItem(
                     getString(R.string.menu_grades_config),
                     null,
-                    icon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline, iconSizeDp, iconColor)
+                    icon(CommunityMaterial.Icon3.cmd_numeric_5_box_outline, iconSizeDp, iconColor)
             ).setOnClickAction(() -> new GradesConfigDialog(activity, false, null, null)));
 
             items.add(new MaterialAboutActionItem(
@@ -958,7 +958,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                     new MaterialAboutSwitchItem.Builder()
                             .text(R.string.settings_register_count_in_seconds_text)
                             .subText(R.string.settings_register_count_in_seconds_subtext)
-                            .icon(icon(CommunityMaterial.Icon2.cmd_timer, iconSizeDp, iconColor))
+                            .icon(icon(CommunityMaterial.Icon3.cmd_timer, iconSizeDp, iconColor))
                     .setChecked(app.getConfig().getTimetable().getCountInSeconds())
                     .setOnCheckedChanged((item, isChecked) -> {
                         app.getConfig().getTimetable().setCountInSeconds(isChecked);
@@ -986,7 +986,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 items.add(
                         new MaterialAboutSwitchItem.Builder()
                                 .text(R.string.settings_register_hide_sticks_from_old)
-                                .icon(icon(CommunityMaterial.Icon2.cmd_numeric_1_box_outline, iconSizeDp, iconColor))
+                                .icon(icon(CommunityMaterial.Icon3.cmd_numeric_1_box_outline, iconSizeDp, iconColor))
                         .setChecked(app.getConfig().forProfile().getGrades().getHideSticksFromOld())
                         .setOnCheckedChanged((item, isChecked) -> {
                             app.getConfig().forProfile().getGrades().setHideSticksFromOld(isChecked);
@@ -1041,7 +1041,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
 
             items.add(new MaterialAboutActionItem.Builder()
                     .text(R.string.settings_about_privacy_policy_text)
-                    .icon(icon(CommunityMaterial.Icon2.cmd_shield_outline, iconSizeDp, primaryTextOnPrimaryBg))
+                    .icon(icon(CommunityMaterial.Icon3.cmd_shield_outline, iconSizeDp, primaryTextOnPrimaryBg))
                     .setOnClickAction(ConvenienceBuilder.createWebsiteOnClickAction(activity, Uri.parse("https://szkolny.eu/privacy-policy")))
                     .build());
 
@@ -1055,7 +1055,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             items.add(new MaterialAboutActionItem.Builder()
                     .text(R.string.settings_about_language_text)
                     .subText(R.string.settings_about_language_subtext)
-                    .icon(icon(CommunityMaterial.Icon2.cmd_translate, iconSizeDp, primaryTextOnPrimaryBg))
+                    .icon(icon(CommunityMaterial.Icon3.cmd_translate, iconSizeDp, primaryTextOnPrimaryBg))
                     .setOnClickAction(() -> {
                         new MaterialDialog.Builder(activity)
                                 .title(getString(R.string.settings_about_language_dialog_title))
@@ -1090,7 +1090,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             items.add(new MaterialAboutActionItem.Builder()
                     .text(R.string.settings_about_update_text)
                     .subText(R.string.settings_about_update_subtext)
-                    .icon(icon(CommunityMaterial.Icon2.cmd_update, iconSizeDp, primaryTextOnPrimaryBg))
+                    .icon(icon(CommunityMaterial.Icon3.cmd_update, iconSizeDp, primaryTextOnPrimaryBg))
                     .setOnClickAction(() -> {
                         //open browser or intent here
                         NetworkUtils net = new NetworkUtils(app);
@@ -1110,7 +1110,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
 
             items.add(new MaterialAboutActionItem.Builder()
                     .text(R.string.settings_about_changelog_text)
-                    .icon(icon(CommunityMaterial.Icon2.cmd_radar, iconSizeDp, primaryTextOnPrimaryBg))
+                    .icon(icon(CommunityMaterial.Icon3.cmd_radar, iconSizeDp, primaryTextOnPrimaryBg))
                     .setOnClickAction(() -> new ChangelogDialog(activity, null, null))
                     .build());
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
index 2e3695cc..d7b1b9a7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
@@ -17,7 +17,6 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import eu.szkolny.font.SzkolnyFont
 import kotlinx.coroutines.*
@@ -192,7 +191,7 @@ class TimetableFragment : Fragment(), CoroutineScope {
                 BottomSheetPrimaryItem(true)
                         .withTitle(R.string.menu_generate_block_timetable)
                         .withDescription(R.string.menu_generate_block_timetable_desc)
-                        .withIcon(Icon2.cmd_table_large)
+                        .withIcon(CommunityMaterial.Icon3.cmd_table_large)
                         .withOnClickListener(View.OnClickListener {
                             activity.bottomSheet.close()
                             GenerateBlockTimetableDialog(activity)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt
index 99abba4d..6f8bc4c7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt
@@ -69,7 +69,7 @@ class AttachmentAdapter(
             "jpg", "jpeg", "png", "bmp", "gif" -> SzkolnyFont.Icon.szf_file_image_outline
             "zip", "rar", "tar", "7z" -> SzkolnyFont.Icon.szf_zip_box_outline
             "html", "cpp", "c", "h", "css", "java", "py" -> SzkolnyFont.Icon.szf_file_code_outline
-            else -> CommunityMaterial.Icon.cmd_file_document_outline
+            else -> CommunityMaterial.Icon2.cmd_file_document_outline
         }
 
         b.chip.text = if (item.isDownloading) {
@@ -83,7 +83,7 @@ class AttachmentAdapter(
 
         b.chip.chipIcon = IconicsDrawable(context).apply {
             icon = attachmentIcon
-            colorAttr(context, R.attr.colorSurface)
+            colorAttr(context, R.attr.colorOnSurface)
             sizeDp = 24
             paddingDp = 2
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
index 07db9ea2..daffae65 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
@@ -117,7 +117,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
 
             views.setImageViewBitmap(
                 R.id.widgetTimetableRefresh,
-                IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh).apply {
+                IconicsDrawable(context, CommunityMaterial.Icon3.cmd_refresh).apply {
                     colorInt = Color.WHITE
                     sizeDp = if (config.bigStyle) 24 else 16
                 }.toBitmap()
diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml
index 11f57902..dc883137 100644
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -206,6 +206,7 @@
                 app:flexWrap="wrap"
                 app:justifyContent="flex_end">
 
+                <!-- cmd_eye_check_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/checkDoneButton"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -213,53 +214,57 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:checkable="true"
-                    android:fontFamily="@font/community_material_font_v3_5_95_1"
+                    android:fontFamily="@font/community_material_font_v5_8_55"
                     android:minWidth="0dp"
-                    android:text="\uFCE1"
+                    android:text="\uf4df"
                     android:textSize="20sp" />
 
+                <!-- cmd_pencil_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/editButton"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:fontFamily="@font/community_material_font_v3_5_95_1"
+                    android:fontFamily="@font/community_material_font_v5_8_55"
                     android:minWidth="0dp"
-                    android:text="\uFC92"
+                    android:text="\uf2f4"
                     android:textSize="20sp" />
 
+                <!-- cmd_calendar_export -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/saveInCalendarButton"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:fontFamily="@font/community_material_font_v3_5_95_1"
+                    android:fontFamily="@font/community_material_font_v5_8_55"
                     android:minWidth="0dp"
-                    android:text="\uFB09"
+                    android:text="\uf97a"
                     android:textSize="20sp" />
 
+                <!-- cmd_cursor_default_click_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/goToTimetableButton"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:fontFamily="@font/community_material_font_v3_5_95_1"
+                    android:fontFamily="@font/community_material_font_v5_8_55"
                     android:minWidth="0dp"
-                    android:text="\uFCDA"
+                    android:text="\ufc90"
                     android:textSize="20sp" />
 
+                <!-- cmd_download_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/downloadButton"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:fontFamily="@font/community_material_font_v3_5_95_1"
+                    android:fontFamily="@font/community_material_font_v5_8_55"
                     android:minWidth="0dp"
-                    android:text="\uFB6B"
+                    android:text="\uf436"
                     android:textSize="20sp" />
             </com.google.android.flexbox.FlexboxLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml
index 295ffdc2..f8f42ef9 100644
--- a/app/src/main/res/layout/event_list_item.xml
+++ b/app/src/main/res/layout/event_list_item.xml
@@ -73,14 +73,15 @@
                 android:textAppearance="@style/NavView.TextView.Medium"
                 tools:text="Rozdział II: Panowanie Piastów i Jagiellonów.Przeniesiony z 11 grudnia. Nie wiem co się dzieje w tym roku nie będzie już religii w szkołach podstawowych w Polsce i Europie zachodniej Afryki" />
 
+            <!-- cmd_pencil_outline -->
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/editButton"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/community_material_font_v3_5_95_1"
+                android:fontFamily="@font/community_material_font_v5_8_55"
                 android:minWidth="0dp"
-                android:text="\uFC92"
+                android:text="\uf2f4"
                 android:textSize="20sp"
                 tools:visibility="gone" />
 
diff --git a/app/src/main/res/layout/login_chooser_fragment.xml b/app/src/main/res/layout/login_chooser_fragment.xml
index 27e6f309..6e83c68c 100644
--- a/app/src/main/res/layout/login_chooser_fragment.xml
+++ b/app/src/main/res/layout/login_chooser_fragment.xml
@@ -18,7 +18,7 @@
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="32dp"
             app:iiv_color="@color/colorPrimary"
-            app:iiv_icon="cmd-school"
+            app:iiv_icon="cmd-school-outline"
             app:iiv_size="32dp"
             tools:srcCompat="@tools:sample/avatars" />
 
diff --git a/app/src/main/res/layout/login_form_fragment.xml b/app/src/main/res/layout/login_form_fragment.xml
index 6bfb817f..ac4afd93 100644
--- a/app/src/main/res/layout/login_form_fragment.xml
+++ b/app/src/main/res/layout/login_form_fragment.xml
@@ -29,7 +29,7 @@
                     android:layout_height="32dp"
                     android:layout_marginTop="32dp"
                     app:iiv_color="@color/colorPrimary"
-                    app:iiv_icon="cmd-account-circle"
+                    app:iiv_icon="cmd-account-circle-outline"
                     app:iiv_size="32dp"
                     tools:srcCompat="@tools:sample/avatars" />
 
diff --git a/app/src/main/res/layout/login_platform_list_fragment.xml b/app/src/main/res/layout/login_platform_list_fragment.xml
index 699177ff..7604f1c7 100644
--- a/app/src/main/res/layout/login_platform_list_fragment.xml
+++ b/app/src/main/res/layout/login_platform_list_fragment.xml
@@ -18,7 +18,7 @@
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="32dp"
             app:iiv_color="@color/colorPrimary"
-            app:iiv_icon="cmd-tooltip-account"
+            app:iiv_icon="cmd-comment-account-outline"
             app:iiv_size="32dp"
             tools:srcCompat="@tools:sample/avatars" />
 
diff --git a/app/src/main/res/layout/login_summary_fragment.xml b/app/src/main/res/layout/login_summary_fragment.xml
index 1b7aac65..174087e8 100644
--- a/app/src/main/res/layout/login_summary_fragment.xml
+++ b/app/src/main/res/layout/login_summary_fragment.xml
@@ -28,7 +28,7 @@
                     android:layout_marginHorizontal="24dp"
                     android:layout_marginTop="32dp"
                     app:iiv_color="@color/colorPrimary"
-                    app:iiv_icon="cmd-account-check"
+                    app:iiv_icon="cmd-account-check-outline"
                     app:iiv_size="32dp"
                     tools:srcCompat="@tools:sample/avatars" />
 
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
index a58f610f..bb252b11 100644
--- a/app/src/main/res/layout/message_fragment.xml
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -217,7 +217,7 @@
                             android:layout_height="24dp"
                             android:padding="4dp"
                             app:iiv_color="?android:textColorSecondary"
-                            app:iiv_icon="cmd-reply"
+                            app:iiv_icon="cmd-reply-outline"
                             tools:srcCompat="@android:drawable/ic_menu_revert" />
 
                         <TextView