diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 85c74072e..495415f9f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -194,12 +194,6 @@ class PreferencesRepository @Inject constructor(
             )
         )
 
-    val showTimetableTimers: Boolean
-        get() = getBoolean(
-            R.string.pref_key_timetable_show_timers,
-            R.bool.pref_default_timetable_show_timers
-        )
-
     val showTimetableGaps: TimetableGapsMode
         get() = TimetableGapsMode.getByValue(
             getString(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
index 1201937c0..a957ef798 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -325,7 +325,7 @@ class TimetableAdapter @Inject constructor() :
 
             override fun getChangePayload(oldItem: TimetableItem, newItem: TimetableItem): Any? {
                 return if (oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal) {
-                    if (oldItem.lesson == newItem.lesson && oldItem.timeLeft != newItem.timeLeft) {
+                    if (oldItem.lesson == newItem.lesson && oldItem.showGroupsInPlan == newItem.showGroupsInPlan && oldItem.timeLeft != newItem.timeLeft) {
                         "time_left"
                     } else super.getChangePayload(oldItem, newItem)
                 } else super.getChangePayload(oldItem, newItem)
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 f99970482..6b442d1c2 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
@@ -1,5 +1,7 @@
 package io.github.wulkanowy.ui.modules.timetable
 
+import android.os.Handler
+import android.os.Looper
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
@@ -236,11 +238,13 @@ class TimetablePresenter @Inject constructor(
     private fun updateData(lessons: List<Timetable>) {
         tickTimer?.cancel()
 
-        if (!prefRepository.showTimetableTimers) {
+        if (currentDate != now()) {
             view?.updateData(createItems(lessons))
         } else {
             tickTimer = timer(period = 2_000) {
-                view?.updateData(createItems(lessons))
+                Handler(Looper.getMainLooper()).post {
+                    view?.updateData(createItems(lessons))
+                }
             }
         }
     }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1749548e1..3af494fa4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -713,7 +713,6 @@
     <string name="pref_view_present">Zobrazit přítomnost</string>
     <string name="pref_view_app_theme">Motiv</string>
     <string name="pref_view_expand_grade">Rozvíjení známek</string>
-    <string name="pref_view_timetable_show_timers">Označit aktuální lekci</string>
     <string name="pref_view_timetable_show_groups">Zobrazit skupiny vedle předmětů</string>
     <string name="pref_view_timetable_show_gaps">Zobrazit prázdné dlaždice, kde není žádná lekce</string>
     <string name="pref_view_grade_statistics_list">Zobrazit seznam grafů v známkách třídy</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 500fba1f3..a89b83769 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -623,7 +623,6 @@
     <string name="pref_view_present">Show presence</string>
     <string name="pref_view_app_theme">Theme</string>
     <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d8cc92984..4c9aa2d28 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -623,7 +623,6 @@
     <string name="pref_view_present">Anwesendheit zeigen</string>
     <string name="pref_view_app_theme">Thema</string>
     <string name="pref_view_expand_grade">Steigende Sorten</string>
-    <string name="pref_view_timetable_show_timers">Aktuelle Lektion markieren</string>
     <string name="pref_view_timetable_show_groups">Gruppen neben Schulfächen anzeigen</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 500fba1f3..a89b83769 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -623,7 +623,6 @@
     <string name="pref_view_present">Show presence</string>
     <string name="pref_view_app_theme">Theme</string>
     <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 500fba1f3..a89b83769 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -623,7 +623,6 @@
     <string name="pref_view_present">Show presence</string>
     <string name="pref_view_app_theme">Theme</string>
     <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9375aeb39..31b9ce32c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -713,7 +713,6 @@
     <string name="pref_view_present">Pokazuj obecność</string>
     <string name="pref_view_app_theme">Motyw</string>
     <string name="pref_view_expand_grade">Rozwijanie ocen</string>
-    <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję</string>
     <string name="pref_view_timetable_show_groups">Pokazuj grupę obok przedmiotu</string>
     <string name="pref_view_timetable_show_gaps">Pokazuj puste kafelki gdzie nie ma lekcji</string>
     <string name="pref_view_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a6e45d445..89a94a59d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -713,7 +713,6 @@
     <string name="pref_view_present">Показывать присутствия</string>
     <string name="pref_view_app_theme">Тема</string>
     <string name="pref_view_expand_grade">Разворачивание оценок</string>
-    <string name="pref_view_timetable_show_timers">Отметить текущий урок</string>
     <string name="pref_view_timetable_show_groups">Показать группы рядом с темами</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ed06e023e..3cde8152c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -713,7 +713,6 @@
     <string name="pref_view_present">Zobraziť prítomnosť</string>
     <string name="pref_view_app_theme">Motív</string>
     <string name="pref_view_expand_grade">Rozvijanie známok</string>
-    <string name="pref_view_timetable_show_timers">Označiť aktuálne lekciu</string>
     <string name="pref_view_timetable_show_groups">Zobraziť skupiny vedľa predmetov</string>
     <string name="pref_view_timetable_show_gaps">Zobraziť prázdne dlaždice, kde nie je žiadne lekcie</string>
     <string name="pref_view_grade_statistics_list">Zobraziť zoznam grafov v známkach triedy</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6a79263f7..20a917aa4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -713,7 +713,6 @@
     <string name="pref_view_present">Показувати присутність</string>
     <string name="pref_view_app_theme">Тема</string>
     <string name="pref_view_expand_grade">Розгортання оцінок</string>
-    <string name="pref_view_timetable_show_timers">Позначити поточний урок</string>
     <string name="pref_view_timetable_show_groups">Показувати групи поруч з темами</string>
     <string name="pref_view_timetable_show_gaps">Показувати порожні плитки там, де немає уроків</string>
     <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index 8d69f25c8..8e6fc7d66 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -22,7 +22,6 @@
     <bool name="pref_default_timetable_show_groups">false</bool>
     <string name="pref_default_timetable_show_whole_class">no</string>
     <string name="pref_default_grade_sorting_mode">alphabetic</string>
-    <bool name="pref_default_timetable_show_timers">false</bool>
     <string name="pref_default_timetable_show_gaps">between</string>
     <bool name="pref_default_subjects_without_grades">false</bool>
     <bool name="pref_default_optional_arithmetic_average">false</bool>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index c48381e8c..5afffb649 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -27,7 +27,6 @@
     <string name="pref_key_grade_sorting_mode">grade_sorting_mode</string>
     <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
     <string name="pref_key_timetable_show_groups">show_groups_in_plan</string>
-    <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
     <string name="pref_key_timetable_show_gaps">timetable_show_gaps</string>
     <string name="pref_key_subjects_without_grades">subjects_without_grades</string>
     <string name="pref_key_optional_arithmetic_average">optional_arithmetic_average</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ba9c9970..5cad09d0b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -701,7 +701,6 @@
     <string name="pref_view_present">Show presence</string>
     <string name="pref_view_app_theme">Theme</string>
     <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
     <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
diff --git a/app/src/main/res/xml/scheme_preferences_appearance.xml b/app/src/main/res/xml/scheme_preferences_appearance.xml
index 7177d396c..9c02a4910 100644
--- a/app/src/main/res/xml/scheme_preferences_appearance.xml
+++ b/app/src/main/res/xml/scheme_preferences_appearance.xml
@@ -90,11 +90,6 @@
         android:layout_height="wrap_content"
         app:iconSpaceReserved="false"
         app:title="@string/pref_timetable_appearance_view">
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_timetable_show_timers"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_timetable_show_timers"
-            app:title="@string/pref_view_timetable_show_timers" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_timetable_show_groups"
             app:iconSpaceReserved="false"