diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
index 4e9baac3a..f5689ec8d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance
 
+import android.content.res.ColorStateList
 import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
@@ -33,17 +34,17 @@ class AttendanceAdapter @Inject constructor() :
     )
 
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val context = holder.binding.root.context
         val item = items[position]
 
         with(holder.binding) {
             attendanceItemNumber.text = item.number.toString()
-            attendanceItemSubject.text = item.subject.ifBlank {
-                root.context.getString(R.string.all_no_data)
-            }
+            attendanceItemSubject.text = item.subject
+                .ifBlank { context.getString(R.string.all_no_data) }
             attendanceItemDescription.setText(item.descriptionRes)
 
             attendanceItemDescription.setTextColor(
-                root.context.getThemeAttrColor(
+                context.getThemeAttrColor(
                     when {
                         item.absence && !item.excused -> R.attr.colorAttendanceAbsence
                         item.lateness && !item.excused -> R.attr.colorAttendanceLateness
@@ -61,13 +62,15 @@ class AttendanceAdapter @Inject constructor() :
             attendanceItemAlert.isVisible =
                 item.let { (it.absence && !it.excused) || (it.lateness && !it.excused) }
 
-            attendanceItemAlert.setColorFilter(root.context.getThemeAttrColor(
-                when{
-                    item.absence && !item.excused -> R.attr.colorAttendanceAbsence
-                    item.lateness && !item.excused -> R.attr.colorAttendanceLateness
-                    else -> android.R.attr.colorPrimary
-                }
-            ))
+            attendanceItemAlert.imageTintList = ColorStateList.valueOf(
+                context.getThemeAttrColor(
+                    when {
+                        item.absence && !item.excused -> R.attr.colorAttendanceAbsence
+                        item.lateness && !item.excused -> R.attr.colorAttendanceLateness
+                        else -> android.R.attr.colorPrimary
+                    }
+                )
+            )
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
             attendanceItemExcuseCheckbox.visibility = View.GONE
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8ad27ad88..f31a5f947 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -46,14 +46,15 @@
 
     <color name="timetable_canceled_light">#d32f2f</color>
     <color name="timetable_canceled_dark">#e57373</color>
+
     <color name="timetable_change_light">#ff8f00</color>
     <color name="timetable_change_dark">#ffd54f</color>
 
     <color name="attendance_absence_light">#d32f2f</color>
     <color name="attendance_absence_dark">#e57373</color>
 
-    <color name="attendance_lateness_light">#cd2a01</color>
-    <color name="attendance_lateness_dark">#f05d0e</color>
+    <color name="attendance_lateness_light">#ff8f00</color>
+    <color name="attendance_lateness_dark">#ffd54f</color>
 
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>