diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index 8b6526cd..d816d8f0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -44,10 +44,10 @@ class AttendanceDialog : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         with(binding) {
-            attendanceDialogSubject.text = attendance.subject
-            attendanceDialogDescription.setText(attendance.description)
-            attendanceDialogDate.text = attendance.date.toFormattedString()
-            attendanceDialogNumber.text = attendance.number.toString()
+            attendanceDialogSubjectValue.text = attendance.subject
+            attendanceDialogDescriptionValue.setText(attendance.description)
+            attendanceDialogDateValue.text = attendance.date.toFormattedString()
+            attendanceDialogNumberValue.text = attendance.number.toString()
             attendanceDialogClose.setOnClickListener { dismiss() }
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
index 6357c495..eb420a6a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
@@ -52,15 +52,15 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        with(binding.mobileDeviceDialogToken) {
+        with(binding.mobileDeviceDialogTokenValue) {
             text = token.token
             setOnClickListener { clickCopy(token.token) }
         }
-        with(binding.mobileDeviceDialogSymbol) {
+        with(binding.mobileDeviceDialogSymbolValue) {
             text = token.symbol
             setOnClickListener { clickCopy(token.symbol) }
         }
-        with(binding.mobileDeviceDialogPin) {
+        with(binding.mobileDeviceDialogPinValue) {
             text = token.pin
             setOnClickListener { clickCopy(token.pin) }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index 4cb1cda0..5811456b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -49,14 +49,14 @@ class NoteDialog : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         with(binding) {
-            noteDialogDate.text = note.date.toFormattedString()
-            noteDialogCategory.text = note.category
-            noteDialogTeacher.text = note.teacher
-            noteDialogContent.text = note.content
+            noteDialogDateValue.text = note.date.toFormattedString()
+            noteDialogCategoryValue.text = note.category
+            noteDialogTeacherValue.text = note.teacher
+            noteDialogContentValue.text = note.content
         }
 
         if (note.isPointsShow) {
-            with(binding.noteDialogPoints) {
+            with(binding.noteDialogPointsValue) {
                 text = "${if (note.points > 0) "+" else ""}${note.points}"
                 setTextColor(
                     when (NoteCategory.getByValue(note.categoryType)) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 7744515d..f8be9a35 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -63,13 +63,13 @@ class TimetableDialog : DialogFragment() {
 
     private fun setSubject(subject: String, subjectOld: String) {
         with(binding) {
-            timetableDialogSubject.text = subject
+            timetableDialogLessonValue.text = subject
             if (subjectOld.isNotBlank() && subjectOld != subject) {
-                timetableDialogSubject.run {
+                timetableDialogLessonValue.run {
                     paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
                     text = subjectOld
                 }
-                timetableDialogSubjectNew.run {
+                timetableDialogLessonNewValue.run {
                     visibility = VISIBLE
                     text = subject
                 }
@@ -88,17 +88,17 @@ class TimetableDialog : DialogFragment() {
                                 R.attr.colorPrimary
                             )
                         )
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                        timetableDialogChangesValue.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
                     } else {
                         timetableDialogChangesTitle.setTextColor(
                             requireContext().getThemeAttrColor(
                                 R.attr.colorTimetableChange
                             )
                         )
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                        timetableDialogChangesValue.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
                     }
 
-                    timetableDialogChanges.text = when {
+                    timetableDialogChangesValue.text = when {
                         canceled && !changes -> "Lekcja odwołana: $info"
                         changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
                         changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
@@ -107,7 +107,7 @@ class TimetableDialog : DialogFragment() {
                 }
                 else -> {
                     timetableDialogChangesTitle.visibility = GONE
-                    timetableDialogChanges.visibility = GONE
+                    timetableDialogChangesValue.visibility = GONE
                 }
             }
         }
@@ -117,22 +117,22 @@ class TimetableDialog : DialogFragment() {
         with(binding) {
             when {
                 teacherOld.isNotBlank() && teacherOld != teacher -> {
-                    timetableDialogTeacher.run {
+                    timetableDialogTeacherValue.run {
                         visibility = VISIBLE
                         paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
                         text = teacherOld
                     }
                     if (teacher.isNotBlank()) {
-                        timetableDialogTeacherNew.run {
+                        timetableDialogTeacherNewValue.run {
                             visibility = VISIBLE
                             text = teacher
                         }
                     }
                 }
-                teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+                teacher.isNotBlank() -> timetableDialogTeacherValue.text = teacher
                 else -> {
                     timetableDialogTeacherTitle.visibility = GONE
-                    timetableDialogTeacher.visibility = GONE
+                    timetableDialogTeacherValue.visibility = GONE
                 }
             }
         }
@@ -141,10 +141,10 @@ class TimetableDialog : DialogFragment() {
     private fun setGroup(group: String) {
         with(binding) {
             when {
-                group.isNotBlank() -> timetableDialogGroup.text = group
+                group.isNotBlank() -> timetableDialogGroupValue.text = group
                 else -> {
                     timetableDialogGroupTitle.visibility = GONE
-                    timetableDialogGroup.visibility = GONE
+                    timetableDialogGroupValue.visibility = GONE
                 }
             }
         }
@@ -154,22 +154,22 @@ class TimetableDialog : DialogFragment() {
         with(binding) {
             when {
                 roomOld.isNotBlank() && roomOld != room -> {
-                    timetableDialogRoom.run {
+                    timetableDialogRoomValue.run {
                         visibility = VISIBLE
                         paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
                         text = roomOld
                     }
                     if (room.isNotBlank()) {
-                        timetableDialogRoomNew.run {
+                        timetableDialogRoomNewValue.run {
                             visibility = VISIBLE
                             text = room
                         }
                     }
                 }
-                room.isNotBlank() -> timetableDialogRoom.text = room
+                room.isNotBlank() -> timetableDialogRoomValue.text = room
                 else -> {
                     timetableDialogRoomTitle.visibility = GONE
-                    timetableDialogRoom.visibility = GONE
+                    timetableDialogRoomValue.visibility = GONE
                 }
             }
         }
@@ -177,7 +177,7 @@ class TimetableDialog : DialogFragment() {
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        binding.timetableDialogTime.text =
+        binding.timetableDialogTimeValue.text =
             "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
index 258fc59d..7d32278f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -42,39 +42,39 @@ class CompletedLessonDialog : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         with(binding) {
-            completedLessonDialogSubject.text = completedLesson.subject
-            completedLessonDialogTopic.text = completedLesson.topic
-            completedLessonDialogTeacher.text = completedLesson.teacher
-            completedLessonDialogAbsence.text = completedLesson.absence
-            completedLessonDialogChanges.text = completedLesson.substitution
-            completedLessonDialogResources.text = completedLesson.resources
+            completedLessonDialogSubjectValue.text = completedLesson.subject
+            completedLessonDialogTopicValue.text = completedLesson.topic
+            completedLessonDialogTeacherValue.text = completedLesson.teacher
+            completedLessonDialogAbsenceValue.text = completedLesson.absence
+            completedLessonDialogChangesValue.text = completedLesson.substitution
+            completedLessonDialogResourcesValue.text = completedLesson.resources
         }
 
         completedLesson.substitution.let {
             if (it.isBlank()) {
                 with(binding) {
                     completedLessonDialogChangesTitle.visibility = View.GONE
-                    completedLessonDialogChanges.visibility = View.GONE
+                    completedLessonDialogChangesValue.visibility = View.GONE
                 }
-            } else binding.completedLessonDialogChanges.text = it
+            } else binding.completedLessonDialogChangesValue.text = it
         }
 
         completedLesson.absence.let {
             if (it.isBlank()) {
                 with(binding) {
                     completedLessonDialogAbsenceTitle.visibility = View.GONE
-                    completedLessonDialogAbsence.visibility = View.GONE
+                    completedLessonDialogAbsenceValue.visibility = View.GONE
                 }
-            } else binding.completedLessonDialogAbsence.text = it
+            } else binding.completedLessonDialogAbsenceValue.text = it
         }
 
         completedLesson.resources.let {
             if (it.isBlank()) {
                 with(binding) {
                     completedLessonDialogResourcesTitle.visibility = View.GONE
-                    completedLessonDialogResources.visibility = View.GONE
+                    completedLessonDialogResourcesValue.visibility = View.GONE
                 }
-            } else binding.completedLessonDialogResources.text = it
+            } else binding.completedLessonDialogResourcesValue.text = it
         }
 
         binding.completedLessonDialogClose.setOnClickListener { dismiss() }
diff --git a/app/src/main/res/layout/dialog_attendance.xml b/app/src/main/res/layout/dialog_attendance.xml
index 22268aac..08ed9d4a 100644
--- a/app/src/main/res/layout/dialog_attendance.xml
+++ b/app/src/main/res/layout/dialog_attendance.xml
@@ -1,92 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
+
+        <View
+            android:layout_width="280dp"
+            android:layout_height="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/attendanceDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_subject"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
-            android:id="@+id/attendanceDialogSubject"
+            android:id="@+id/attendanceDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogSubjectTitle" />
+
 
         <TextView
+            android:id="@+id/attendanceDialogDescriptionTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogSubjectValue" />
 
         <TextView
-            android:id="@+id/attendanceDialogDescription"
+            android:id="@+id/attendanceDialogDescriptionValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDescriptionTitle" />
 
         <TextView
+            android:id="@+id/attendanceDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDescriptionValue" />
 
         <TextView
-            android:id="@+id/attendanceDialogDate"
+            android:id="@+id/attendanceDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDateTitle" />
 
         <TextView
+            android:id="@+id/attendanceDialogNumberTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/attendance_number"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDateValue" />
 
         <TextView
-            android:id="@+id/attendanceDialogNumber"
+            android:id="@+id/attendanceDialogNumberValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogNumberTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogNumberValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index 2d4e5d0b..0d79e19e 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -10,9 +10,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingHorizontal="20dp"
-        android:paddingTop="20dp"
+        android:paddingTop="24dp"
         android:text="@string/all_details"
-        android:textSize="20sp" />
+        android:textSize="21sp"
+        android:textStyle="bold"/>
 
     <TextView
         android:id="@+id/errorDialogMessage"
@@ -67,12 +68,18 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogReport"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
+            android:layout_height="36dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:layout_gravity="center_vertical"
             android:text="@string/about_feedback" />
 
         <Space
@@ -82,20 +89,34 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCancel"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="36dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:layout_gravity="center_vertical"
             android:text="@android:string/cancel" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCopy"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="36dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:layout_gravity="center_vertical"
             android:text="@android:string/copy" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_exam.xml b/app/src/main/res/layout/dialog_exam.xml
index 8e46dc4f..51153ac8 100644
--- a/app/src/main/res/layout/dialog_exam.xml
+++ b/app/src/main/res/layout/dialog_exam.xml
@@ -1,113 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
+
+        <View
+            android:layout_width="280dp"
+            android:layout_height="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/examDialogSubject"
+            android:id="@+id/examDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_subject"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
             android:id="@+id/examDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogSubjectTitle" />
 
         <TextView
-            android:id="@+id/examDialogType"
+            android:id="@+id/examDialogTypeTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/exam_type"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogSubjectValue" />
 
         <TextView
             android:id="@+id/examDialogTypeValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTypeTitle" />
 
         <TextView
-            android:id="@+id/examDialogTeacher"
+            android:id="@+id/examDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTypeValue" />
 
         <TextView
             android:id="@+id/examDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTeacherTitle" />
 
         <TextView
-            android:id="@+id/examDialogDate"
+            android:id="@+id/examDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/exam_entry_date"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTeacherValue" />
 
         <TextView
             android:id="@+id/examDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDateTitle" />
 
         <TextView
-            android:id="@+id/examDialogDescription"
+            android:id="@+id/examDialogDescriptionTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDateValue" />
 
         <TextView
             android:id="@+id/examDialogDescriptionValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDescriptionTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/examDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="20dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDescriptionValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index be0570c2..9ed2bc06 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -8,19 +8,20 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="300dp">
+        android:minWidth="300dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:padding="20dp"
+            android:layout_marginTop="24dp"
             tools:ignore="UselessParent">
 
             <LinearLayout
                 android:id="@+id/gradeDialogValueLayout"
-                android:layout_width="86dp"
-                android:layout_height="match_parent"
+                android:layout_width="101dp"
+                android:layout_height="121dp"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
@@ -31,6 +32,8 @@
                     android:id="@+id/gradeDialogValue"
                     android:layout_width="match_parent"
                     android:layout_height="86dp"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="16dp"
                     android:background="@color/grade_material_default"
                     android:gravity="center"
                     android:textColor="@android:color/white"
@@ -42,7 +45,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
+                    android:layout_marginStart="0dp"
                     android:layout_marginTop="2dp"
+                    android:layout_marginEnd="16dp"
                     android:background="@color/grade_black"
                     android:gravity="center"
                     android:maxLines="2"
@@ -57,15 +62,13 @@
                 android:id="@+id/gradeDialogHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:layout_marginRight="12dp"
+                android:layout_marginEnd="14dp"
+                android:layout_marginRight="14dp"
                 android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:layout_toLeftOf="@+id/gradeDialogValueLayout"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:minHeight="120dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -74,101 +77,32 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
                     android:gravity="center_vertical"
-                    android:maxLines="2"
                     android:text="@string/grade_header"
                     android:textIsSelectable="true"
-                    android:textSize="20sp" />
+                    android:textSize="21sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/gradeDialogDescriptionValue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
                     android:text="@string/all_no_description"
-                    android:textColor="?android:textColorSecondary"
+                    android:layout_marginTop="8dp"
                     android:textIsSelectable="true"
                     android:textSize="16sp" />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/gradeDialogComment"
+                android:id="@+id/gradeDialogDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/gradeDialogHeader"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/grade_comment"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogCommentValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogComment"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/grade_comment"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogTeacher"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogCommentValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/all_teacher"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogTeacherValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogTeacher"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_teacher"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogColor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogTeacherValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/all_color"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogColorValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogColor"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_color"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogColorValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="16dp"
                 android:text="@string/all_date"
-                android:textSize="17sp" />
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/gradeDialogDateValue"
@@ -177,22 +111,102 @@
                 android:layout_below="@+id/gradeDialogDate"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
+                android:layout_marginEnd="24dp"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:text="@string/all_date"
                 android:textIsSelectable="true"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogComment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogDateValue"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="16dp"
+                android:text="@string/grade_comment"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="12sp" />
 
+            <TextView
+                android:id="@+id/gradeDialogCommentValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogComment"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:text="@string/grade_comment"
+                android:textIsSelectable="true"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogTeacher"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogCommentValue"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="16dp"
+                android:text="@string/all_teacher"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogTeacherValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogTeacher"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:text="@string/all_teacher"
+                android:textIsSelectable="true"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogColor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogTeacherValue"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="16dp"
+                android:text="@string/all_color"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogColorValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogColor"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:text="@string/all_color"
+                android:textIsSelectable="true"
+                android:textSize="16sp" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@+id/gradeDialogDateValue"
-                android:layout_alignParentEnd="true"
+                android:layout_height="36dp"
+                android:layout_below="@+id/gradeDialogColorValue"
                 android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginTop="25dp"
+                android:layout_marginTop="36dp"
+                android:layout_marginBottom="8dp"
+                android:insetLeft="0dp"
+                android:insetTop="0dp"
+                android:insetRight="0dp"
+                android:insetBottom="0dp"
+                android:minWidth="88dp"
                 android:text="@string/all_close" />
+
         </RelativeLayout>
+
     </LinearLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index 7c149d4b..b5687c0a 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -26,7 +26,15 @@
             android:id="@+id/homeworkDialogRead"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
             android:layout_alignParentStart="true"
             android:layout_alignParentBottom="true"
             android:text="@string/homework_mark_as_done"
@@ -37,7 +45,15 @@
             android:id="@+id/homeworkDialogClose"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:text="@string/all_close"
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 31ca7dd3..500cdb6f 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -1,145 +1,245 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.modules.timetable.completed.CompletedLessonDialog">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
+
+        <View
+            android:layout_width="280dp"
+            android:layout_height="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/completedLessonDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_lesson"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
-            android:id="@+id/completedLessonDialogSubject"
+            android:id="@+id/completedLessonDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogSubjectTitle" />
 
         <TextView
+            android:id="@+id/completedLessonDialogTopicTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_topic"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogSubjectValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogTopic"
+            android:id="@+id/completedLessonDialogTopicValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTopicTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTopicValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogTeacher"
+            android:id="@+id/completedLessonDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTeacherTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogChangesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_changes"
             android:textColor="?colorTimetableChange"
-            android:textSize="17sp" />
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTeacherValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogChanges"
+            android:id="@+id/completedLessonDialogChangesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogChangesTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogAbsenceTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_absence"
             android:textColor="?colorPrimary"
-            android:textSize="17sp" />
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogChangesValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogAbsence"
+            android:id="@+id/completedLessonDialogAbsenceValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogAbsenceTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogResourcesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_resources"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogAbsenceValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogResources"
+            android:id="@+id/completedLessonDialogResourcesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:autoLink="web"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogResourcesTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogResourcesValue" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 680f5719..2ec89aee 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -1,97 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.modules.mobiledevice.token.MobileDeviceTokenDialog">
 
-    <FrameLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/mobileDeviceDialogContent"
-            android:layout_width="match_parent"
+        <View
+            android:layout_width="292dp"
+            android:layout_height="416dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/mobileDeviceQr"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/mobile_device_qr"
+            tools:src="@tools:sample/avatars"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogTokenTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/mobile_device_token"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceQr" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogTokenValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogTokenTitle" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogSymbolTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/mobile_device_symbol"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogTokenValue" />
+        <TextView
+            android:id="@+id/mobileDeviceDialogSymbolValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogSymbolTitle" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogPinTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/mobile_device_pin"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogSymbolValue" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogPinValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogPinTitle" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/mobileDeviceDialogClose"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogPinValue" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/mobileDeviceDialogContent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:visibility="invisible"
-            tools:visibility="visible">
-
-            <ImageView
-                android:id="@+id/mobileDeviceQr"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="12dp"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/mobile_device_qr"
-                tools:src="@tools:sample/avatars" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/mobile_device_token"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/mobileDeviceDialogToken"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/mobile_device_symbol"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/mobileDeviceDialogSymbol"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/mobile_device_pin"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/mobileDeviceDialogPin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/mobileDeviceDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="15dp"
-                android:text="@string/all_close" />
-        </LinearLayout>
+            tools:visibility="visible"
+            app:constraint_referenced_ids="mobileDeviceQr,mobileDeviceDialogTokenTitle,mobileDeviceDialogTokenValue,mobileDeviceDialogSymbolTitle,mobileDeviceDialogSymbolValue,mobileDeviceDialogPinTitle,mobileDeviceDialogPinValue,mobileDeviceDialogClose" />
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/mobileDeviceDialogProgress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:indeterminate="true"
-            tools:visibility="invisible" />
-    </FrameLayout>
+            tools:visibility="invisible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index 71506b01..57a4ad82 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -1,109 +1,209 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
+
+        <View
+            android:layout_width="280dp"
+            android:layout_height="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/noteDialogCategoryTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_category"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
-            android:id="@+id/noteDialogCategory"
+            android:id="@+id/noteDialogCategoryValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogCategoryTitle" />
 
         <TextView
+            android:id="@+id/noteDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogCategoryValue" />
 
         <TextView
-            android:id="@+id/noteDialogTeacher"
+            android:id="@+id/noteDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogTeacherTitle" />
 
         <TextView
+            android:id="@+id/noteDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogTeacherValue" />
 
         <TextView
-            android:id="@+id/noteDialogDate"
+            android:id="@+id/noteDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogDateTitle" />
 
         <TextView
+            android:id="@+id/noteDialogPointsTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/note_points"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogDateValue" />
 
         <TextView
-            android:id="@+id/noteDialogPoints"
+            android:id="@+id/noteDialogPointsValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogPointsTitle" />
 
         <TextView
+            android:id="@+id/noteDialogContentTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_content"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogPointsValue" />
 
         <TextView
-            android:id="@+id/noteDialogContent"
+            android:id="@+id/noteDialogContentValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:lineSpacingMultiplier="1.2"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogContentTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/noteDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogContentValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index f3d4cf1c..04a5c0c1 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -1,167 +1,298 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
+
+        <View
+            android:layout_width="280dp"
+            android:layout_height="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/timetableDialogChangesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_changes"
             android:textColor="?colorTimetableChange"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/timetableDialogChanges"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/timetable_lesson"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/timetableDialogSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/timetableDialogSubjectNew"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
-            android:textIsSelectable="true"
             android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
+
+        <TextView
+            android:id="@+id/timetableDialogChangesValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
+            android:text="@string/all_no_data"
+            android:textColor="?colorTimetableChange"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogChangesTitle" />
+
+        <TextView
+            android:id="@+id/timetableDialogLessonTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/timetable_lesson"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogChangesValue" />
+
+        <TextView
+            android:id="@+id/timetableDialogLessonValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonTitle" />
+
+        <TextView
+            android:id="@+id/timetableDialogLessonNewValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
+            android:text="@string/all_no_data"
+            android:textColor="?colorTimetableChange"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonValue" />
 
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonNewValue" />
 
         <TextView
-            android:id="@+id/timetableDialogTeacher"
+            android:id="@+id/timetableDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherTitle" />
 
         <TextView
-            android:id="@+id/timetableDialogTeacherNew"
+            android:id="@+id/timetableDialogTeacherNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="12sp"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherValue" />
 
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_group"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherNewValue" />
 
         <TextView
-            android:id="@+id/timetableDialogGroup"
+            android:id="@+id/timetableDialogGroupValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogGroupTitle" />
 
         <TextView
             android:id="@+id/timetableDialogRoomTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_room"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogGroupValue" />
 
         <TextView
-            android:id="@+id/timetableDialogRoom"
+            android:id="@+id/timetableDialogRoomValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomTitle" />
 
         <TextView
-            android:id="@+id/timetableDialogRoomNew"
+            android:id="@+id/timetableDialogRoomNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="12sp"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomValue" />
 
         <TextView
+            android:id="@+id/timetableDialogTimeTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_time"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomNewValue" />
 
         <TextView
-            android:id="@+id/timetableDialogTime"
+            android:id="@+id/timetableDialogTimeValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTimeTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="8dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:minWidth="88dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTimeValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachment.xml b/app/src/main/res/layout/item_homework_dialog_attachment.xml
index ec0b37f2..1c2877d2 100644
--- a/app/src/main/res/layout/item_homework_dialog_attachment.xml
+++ b/app/src/main/res/layout/item_homework_dialog_attachment.xml
@@ -3,18 +3,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="20dp"
-    android:paddingTop="3dp"
-    android:paddingEnd="10dp"
-    android:paddingBottom="3dp">
+    android:background="?selectableItemBackground">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/homeworkDialogAttachment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:drawablePadding="10dp"
-        android:textSize="12sp"
+        android:textSize="16sp"
         app:drawableStartCompat="@drawable/ic_attachment"
         app:drawableTint="?colorOnBackground"
         tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
index 383cbeaf..dfe9db90 100644
--- a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
+++ b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
@@ -7,8 +7,10 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/homework_attachments"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_details.xml b/app/src/main/res/layout/item_homework_dialog_details.xml
index 3b5705bf..abc371da 100644
--- a/app/src/main/res/layout/item_homework_dialog_details.xml
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -4,121 +4,162 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="20dp"
-    android:paddingTop="20dp"
-    android:paddingEnd="20dp">
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp">
 
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        app:srcCompat="@drawable/ic_fullscreen"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription" />
+        android:orientation="horizontal" >
 
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen_exit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_fullscreen_exit"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/all_details"
-        android:textSize="20sp" />
+        <TextView
+            android:id="@+id/allDetailsHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_details"
+            android:textSize="21sp"
+            android:textStyle="bold" />
+
+        <ImageButton
+            android:id="@+id/homework_dialog_full_screen"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?selectableItemBackgroundBorderless"
+            android:layout_marginTop="24dp"
+            android:padding="5dp"
+            app:srcCompat="@drawable/ic_fullscreen"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
+
+        <ImageButton
+            android:id="@+id/homework_dialog_full_screen_exit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?selectableItemBackgroundBorderless"
+            android:layout_marginTop="24dp"
+            android:padding="5dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_fullscreen_exit"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
+
+    </LinearLayout>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="28dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_subject"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_teacher"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_date"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_entry_date"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogEntryDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_content"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:autoLink="web"
         android:lineSpacingMultiplier="1.2"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp"
+        android:textSize="16sp"
         tools:text="@tools:sample/lorem/random" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b2e0dcef..a68e2710 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,7 +24,7 @@
     <color name="note_positive">#a0c431</color>
     <color name="note_negative">#d43f3f</color>
 
-    <color name="grade_black">#424242</color>
+    <color name="grade_black">#1C1C1C</color>
     <color name="grade_red">#d43f3f</color>
     <color name="grade_blue">#49a6f2</color>
     <color name="grade_green">#a0c431</color>