diff --git a/app/src/main/res/layout/activity_gtfo.xml b/app/src/main/res/layout/activity_gtfo.xml
index f0ff621c..668549e6 100644
--- a/app/src/main/res/layout/activity_gtfo.xml
+++ b/app/src/main/res/layout/activity_gtfo.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_margin="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/gtfo"
         android:contentDescription="TODO" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/card_update.xml b/app/src/main/res/layout/card_update.xml
index 5218e51c..3f937409 100644
--- a/app/src/main/res/layout/card_update.xml
+++ b/app/src/main/res/layout/card_update.xml
@@ -53,10 +53,7 @@
                         android:id="@+id/cardUpdateText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginHorizontal="8dp"
                         android:layout_marginBottom="8dp"
                         android:text="@string/card_update_text_format"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -86,4 +83,4 @@
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_announcements.xml b/app/src/main/res/layout/fragment_announcements.xml
index e25911f8..cb7d38d0 100644
--- a/app/src/main/res/layout/fragment_announcements.xml
+++ b/app/src/main/res/layout/fragment_announcements.xml
@@ -21,12 +21,7 @@
             android:id="@+id/announcementsNoData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_margin="8dp"
             android:text="@string/school_notices_no_data"
             android:textSize="18sp"
             android:textStyle="italic"
@@ -37,4 +32,4 @@
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index c0ddb3d4..da464f3b 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -152,8 +152,7 @@
                 android:id="@+id/attendancePercentage"
                 android:layout_width="160dp"
                 android:layout_height="160dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
                 app:direction="clockwise"
                 app:drawDot="false"
diff --git a/app/src/main/res/layout/fragment_behaviour.xml b/app/src/main/res/layout/fragment_behaviour.xml
index 23d2a99f..ddd9faed 100644
--- a/app/src/main/res/layout/fragment_behaviour.xml
+++ b/app/src/main/res/layout/fragment_behaviour.xml
@@ -17,8 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp">
+            android:layout_marginHorizontal="8dp">
 
             <TextView
                 android:id="@+id/noticesSummaryTitle"
@@ -132,4 +131,4 @@
         </FrameLayout>
     </LinearLayout>
     </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index 2fecffa5..bf27e110 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -11,11 +11,8 @@
         android:id="@+id/runLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,10 +30,7 @@
         android:id="@+id/textView3"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:text="@string/debug_notice"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -48,10 +42,7 @@
         android:id="@+id/debugRegister"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         style="@style/Widget.MaterialComponents.Button"
         android:text="Run"
         app:layout_constraintEnd_toStartOf="@+id/guideline2"
@@ -69,10 +60,7 @@
         android:id="@+id/debugAppconfig"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         style="@style/Widget.MaterialComponents.Button"
         android:text="AppConfig"
         app:layout_constraintEnd_toStartOf="@+id/guideline3"
@@ -90,10 +78,7 @@
         android:id="@+id/debugAppprofile"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         style="@style/Widget.MaterialComponents.Button"
         android:text="AppProfile"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index 57918bb8..64aa6a4f 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -30,11 +30,8 @@
                 android:id="@+id/faqText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:autoLink="all"
                 android:background="?selectableItemBackground"
                 android:text="@string/feedback_faq"
@@ -64,11 +61,8 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:text="@string/feedback_title"
                 android:textSize="20sp" />
 
@@ -76,11 +70,8 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:hint="@string/feedback_ask_a_question"
                 app:errorEnabled="true"
                 app:hintAnimationEnabled="true"
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index 953638cf..af7995d2 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -73,9 +73,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:layout_marginTop="16dp"
-                    android:layout_marginEnd="32dp"
                     android:gravity="center"
                     android:text="@string/timetable_not_public_text"
                     android:textSize="16sp" />
@@ -83,9 +82,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:layout_marginTop="16dp"
-                    android:layout_marginEnd="32dp"
                     android:gravity="center"
                     android:text="@string/timetable_not_public_hint"
                     android:textSize="14sp" />
diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml
index d7fe38e3..1ff1f0b0 100644
--- a/app/src/main/res/layout/grades_item_grade.xml
+++ b/app/src/main/res/layout/grades_item_grade.xml
@@ -88,10 +88,7 @@
                     android:id="@+id/gradeCategory"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:ellipsize="end"
                     android:maxWidth="200dp"
                     android:maxLines="1"
diff --git a/app/src/main/res/layout/grades_item_stats.xml b/app/src/main/res/layout/grades_item_stats.xml
index 46e1a403..765aed8b 100644
--- a/app/src/main/res/layout/grades_item_stats.xml
+++ b/app/src/main/res/layout/grades_item_stats.xml
@@ -41,8 +41,7 @@
             android:id="@+id/normalTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginHorizontal="8dp"
             android:text="@string/grades_stats_normal"
             android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -182,9 +181,8 @@
             android:id="@+id/pointTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
             android:text="@string/grades_stats_point"
             android:textAppearance="@style/NavView.TextView.Subtitle" />
 
diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml
index fa056966..9363a92f 100644
--- a/app/src/main/res/layout/messages_compose_fragment.xml
+++ b/app/src/main/res/layout/messages_compose_fragment.xml
@@ -87,8 +87,7 @@
                 android:id="@+id/fontStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="4dp">
 
                 <com.google.android.material.button.MaterialButton
@@ -125,8 +124,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:text="Breakpoints!"
                 android:visibility="gone"/>
 
diff --git a/app/src/main/res/layout/messages_details.xml b/app/src/main/res/layout/messages_details.xml
index cddc8a89..5146b956 100644
--- a/app/src/main/res/layout/messages_details.xml
+++ b/app/src/main/res/layout/messages_details.xml
@@ -59,12 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_margin="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/messages_item.xml b/app/src/main/res/layout/messages_item.xml
index f1921e45..d095a992 100644
--- a/app/src/main/res/layout/messages_item.xml
+++ b/app/src/main/res/layout/messages_item.xml
@@ -63,10 +63,7 @@
             android:id="@+id/messageSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:singleLine="true"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
@@ -96,10 +93,7 @@
             android:id="@+id/messageBody"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginBottom="12dp"
             android:singleLine="true"
             android:textAppearance="@style/NavView.TextView.Helper"
diff --git a/app/src/main/res/layout/messages_list_item.xml b/app/src/main/res/layout/messages_list_item.xml
index 686e9dce..d8c1b8d8 100644
--- a/app/src/main/res/layout/messages_list_item.xml
+++ b/app/src/main/res/layout/messages_list_item.xml
@@ -39,10 +39,7 @@
             android:id="@+id/messageSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:singleLine="true"
             android:textStyle="normal"
             android:textAppearance="@style/NavView.TextView.Helper"
@@ -73,10 +70,7 @@
             android:id="@+id/messageBody"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginBottom="12dp"
             android:singleLine="true"
             android:textAppearance="@style/NavView.TextView.Helper"
diff --git a/app/src/main/res/layout/row_attendance_item.xml b/app/src/main/res/layout/row_attendance_item.xml
index d6e6bfd2..0e68aa70 100644
--- a/app/src/main/res/layout/row_attendance_item.xml
+++ b/app/src/main/res/layout/row_attendance_item.xml
@@ -43,10 +43,7 @@
         android:id="@+id/attendanceSubject"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-medium"
         android:singleLine="true"
@@ -59,10 +56,7 @@
         android:id="@+id/attendanceTeacher"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="@style/NavView.TextView.Helper"
diff --git a/app/src/main/res/layout/row_dialog_event_list_item.xml b/app/src/main/res/layout/row_dialog_event_list_item.xml
index 1ac0f53b..111313d8 100644
--- a/app/src/main/res/layout/row_dialog_event_list_item.xml
+++ b/app/src/main/res/layout/row_dialog_event_list_item.xml
@@ -80,11 +80,8 @@
                     android:id="@+id/eventListItemTeacherName"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:layout_marginTop="4dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:ellipsize="end"
                     android:maxLines="2"
                     android:textAppearance="@style/NavView.TextView.Helper"
@@ -134,11 +131,8 @@
                     android:id="@+id/eventListItemSharedBy"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     tools:text="{cmd-share-variant} przez Jan Kowalski"
diff --git a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
index 8d303464..0d64770d 100644
--- a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
+++ b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
@@ -10,9 +10,8 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginTop="4dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
         android:background="?selectableItemBackground"
         app:cardCornerRadius="5dp"
diff --git a/app/src/main/res/layout/row_homework_item.xml b/app/src/main/res/layout/row_homework_item.xml
index 986ce392..89685e30 100644
--- a/app/src/main/res/layout/row_homework_item.xml
+++ b/app/src/main/res/layout/row_homework_item.xml
@@ -43,8 +43,7 @@
                     android:id="@+id/homeworkItemSharedBy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:ellipsize="end"
                     android:gravity="end"
                     android:maxLines="1"
diff --git a/app/src/main/res/layout/row_timetable_item.xml b/app/src/main/res/layout/row_timetable_item.xml
index cde2600f..d1df1893 100644
--- a/app/src/main/res/layout/row_timetable_item.xml
+++ b/app/src/main/res/layout/row_timetable_item.xml
@@ -10,9 +10,8 @@
         android:id="@+id/timetableItemCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginTop="4dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
         android:background="?selectableItemBackground"
         app:cardCornerRadius="5dp"
@@ -89,10 +88,7 @@
                 android:id="@+id/timetableItemSubjectChange"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/timetableItemTeamName"
                 app:layout_constraintStart_toEndOf="@+id/timetableItemEndTime"
@@ -103,10 +99,7 @@
                 android:id="@+id/timetableItemSubjectName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:textSize="18sp"
@@ -161,4 +154,4 @@
 
     </com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/timetable_free_day.xml b/app/src/main/res/layout/timetable_free_day.xml
index bd434b6e..0cc275a2 100644
--- a/app/src/main/res/layout/timetable_free_day.xml
+++ b/app/src/main/res/layout/timetable_free_day.xml
@@ -32,8 +32,7 @@
         android:id="@+id/freeDayText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
+        android:layout_marginHorizontal="32dp"
         android:gravity="center"
         android:textSize="16sp"
         tools:text="Dzień wolny dla szkoły z puli dyrektorskiej z okazji obchodów Światowego Dnia Wtorku w mieście Poznań i na przedmieśiach" />
@@ -45,4 +44,4 @@
         android:layout_marginTop="16dp"
         android:text="@string/timetable_free_day_show" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml
index fc39e799..3c998027 100644
--- a/app/src/main/res/layout/timetable_lesson.xml
+++ b/app/src/main/res/layout/timetable_lesson.xml
@@ -75,10 +75,7 @@
                     android:layout_width="12dp"
                     android:layout_height="12dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:visibility="@{unread ? View.VISIBLE : View.GONE}"
                     android:background="@drawable/unread_red_circle" />
 
diff --git a/app/src/main/res/layout/timetable_no_timetable.xml b/app/src/main/res/layout/timetable_no_timetable.xml
index 8c80ee02..ce3bf187 100644
--- a/app/src/main/res/layout/timetable_no_timetable.xml
+++ b/app/src/main/res/layout/timetable_no_timetable.xml
@@ -25,9 +25,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
+            android:layout_marginHorizontal="32dp"
             android:layout_marginTop="16dp"
-            android:layout_marginEnd="32dp"
             android:gravity="center"
             android:text="@string/timetable_no_timetable_text"
             android:textSize="16sp" />
@@ -48,4 +47,4 @@
             tools:text="@string/timetable_no_timetable_week" />
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>