diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index b5687c0ae..69c02d5a4 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -19,12 +19,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_all_divider"
-        android:paddingHorizontal="10dp"
-        android:paddingVertical="5dp">
+        android:gravity="end"
+        android:minHeight="52dp"
+        android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogRead"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginTop="8dp"
@@ -35,6 +36,7 @@
             android:insetRight="0dp"
             android:insetBottom="0dp"
             android:minWidth="88dp"
+            android:layout_gravity="center_vertical"
             android:layout_alignParentStart="true"
             android:layout_alignParentBottom="true"
             android:text="@string/homework_mark_as_done"
@@ -43,7 +45,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginTop="8dp"
@@ -54,6 +56,7 @@
             android:insetRight="0dp"
             android:insetBottom="0dp"
             android:minWidth="88dp"
+            android:layout_gravity="center_vertical"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:text="@string/all_close"
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 2ec89aee0..043afb2ad 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -13,7 +13,7 @@
 
         <View
             android:layout_width="292dp"
-            android:layout_height="416dp"
+            android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index e4871f3c2..ec07e149f 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -520,6 +520,7 @@ class GradeAverageProviderTest {
     fun `calc all year average`() {
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
         every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.isOptionalArithmeticAverage } returns false
         coEvery {
             gradeRepository.getGrades(
                 student,