diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml
index d2c42753..f013726b 100644
--- a/app/src/main/res/layout/card_home.xml
+++ b/app/src/main/res/layout/card_home.xml
@@ -7,7 +7,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
+    android:layout_marginVertical="8dp"
     android:clickable="true"
     android:focusable="true" />
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
index 0df38a7d..88141c86 100644
--- a/app/src/main/res/layout/card_home_timetable.xml
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -205,8 +205,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginVertical="4dp"
                 android:background="@color/dividerColor" />
 
             <LinearLayout
@@ -258,8 +257,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginVertical="4dp"
                 android:background="@color/dividerColor" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_config_grades.xml b/app/src/main/res/layout/dialog_config_grades.xml
index 8c5bed58..78ce28bb 100644
--- a/app/src/main/res/layout/dialog_config_grades.xml
+++ b/app/src/main/res/layout/dialog_config_grades.xml
@@ -19,8 +19,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginVertical="16dp"
                 style="@style/TextAppearance.AppCompat.Small"
                 android:text="@string/grades_config_title"/>
 
@@ -140,8 +139,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginVertical="4dp"
                 style="@style/TextAppearance.AppCompat.Small"
                 android:text="@string/menu_grades_sort_mode"/>
 
diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml
index 6461f14d..59fd7f8c 100644
--- a/app/src/main/res/layout/dialog_day.xml
+++ b/app/src/main/res/layout/dialog_day.xml
@@ -53,8 +53,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="8dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
+                    android:layout_marginVertical="5dp"
                     android:visibility="gone"
                     tools:visibility="visible" />
             </LinearLayout>
@@ -71,8 +70,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="8dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
+                    android:layout_marginVertical="5dp"
                     android:visibility="gone"
                     tools:visibility="visible" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_event_list.xml b/app/src/main/res/layout/dialog_event_list.xml
index 0b49bdd4..114d9c1c 100644
--- a/app/src/main/res/layout/dialog_event_list.xml
+++ b/app/src/main/res/layout/dialog_event_list.xml
@@ -17,8 +17,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
+                android:layout_marginVertical="5dp"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -28,8 +27,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
+                android:layout_marginVertical="5dp"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index d4891dd6..79d1466d 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -103,8 +103,7 @@
             android:id="@+id/chatLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginVertical="8dp"
             android:orientation="vertical"
             android:visibility="visible">
 
@@ -119,8 +118,7 @@
                 android:id="@+id/chat_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp" />
+                android:layout_marginVertical="8dp" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
index 4a475824..ee6dfd85 100644
--- a/app/src/main/res/layout/message_fragment.xml
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -138,8 +138,7 @@
                     android:id="@+id/body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
                     android:minHeight="250dp"
                     android:paddingHorizontal="16dp"
                     android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/messages_details.xml b/app/src/main/res/layout/messages_details.xml
index b0cbb487..5aa8f319 100644
--- a/app/src/main/res/layout/messages_details.xml
+++ b/app/src/main/res/layout/messages_details.xml
@@ -153,8 +153,7 @@
                     android:id="@+id/messageBody"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
                     android:autoLink="all"
                     android:minHeight="250dp"
                     android:paddingHorizontal="16dp"
diff --git a/app/src/main/res/layout/row_attendance_item.xml b/app/src/main/res/layout/row_attendance_item.xml
index 0e68aa70..af5ca544 100644
--- a/app/src/main/res/layout/row_attendance_item.xml
+++ b/app/src/main/res/layout/row_attendance_item.xml
@@ -70,10 +70,9 @@
         android:id="@+id/attendanceTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
+        android:layout_marginVertical="0dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:layout_marginBottom="0dp"
         android:textAppearance="@style/NavView.TextView.Helper"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
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 0d64770d..0b8383d1 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
@@ -11,8 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginVertical="4dp"
         android:background="?selectableItemBackground"
         app:cardCornerRadius="5dp"
         app:cardElevation="4dp">
diff --git a/app/src/main/res/layout/row_login_profile_list_item.xml b/app/src/main/res/layout/row_login_profile_list_item.xml
index 550034a3..3c222843 100644
--- a/app/src/main/res/layout/row_login_profile_list_item.xml
+++ b/app/src/main/res/layout/row_login_profile_list_item.xml
@@ -15,8 +15,7 @@
             android:id="@+id/checkBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp" />
+            android:layout_marginVertical="8dp" />
 
         <LinearLayout
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/row_notices_item.xml b/app/src/main/res/layout/row_notices_item.xml
index 8a0242f4..83f8a5d9 100644
--- a/app/src/main/res/layout/row_notices_item.xml
+++ b/app/src/main/res/layout/row_notices_item.xml
@@ -33,8 +33,7 @@
                     android:id="@+id/noticesItemType"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:srcCompat="@tools:sample/avatars" />
diff --git a/app/src/main/res/layout/row_timetable_item.xml b/app/src/main/res/layout/row_timetable_item.xml
index d1df1893..0171ff67 100644
--- a/app/src/main/res/layout/row_timetable_item.xml
+++ b/app/src/main/res/layout/row_timetable_item.xml
@@ -11,8 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginVertical="4dp"
         android:background="?selectableItemBackground"
         app:cardCornerRadius="5dp"
         app:cardElevation="4dp">
@@ -142,8 +141,7 @@
             <com.mikepenz.iconics.view.IconicsTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginVertical="8dp"
                 android:text="{cmd-clock}"
                 app:layout_constraintBottom_toTopOf="@+id/timetableItemEndTime"
                 app:layout_constraintEnd_toEndOf="@+id/timetableItemEndTime"
diff --git a/app/src/main/res/layout/row_widget_notifications_big_item.xml b/app/src/main/res/layout/row_widget_notifications_big_item.xml
index d95daaa8..3b369ed6 100644
--- a/app/src/main/res/layout/row_widget_notifications_big_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginVertical="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
         android:textSize="14sp"
         tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml b/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
index 3917cb91..fda1a2cb 100644
--- a/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginVertical="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
         android:textSize="14sp"
         tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_dark_item.xml b/app/src/main/res/layout/row_widget_notifications_dark_item.xml
index 3bb9a0c9..6426a4bb 100644
--- a/app/src/main/res/layout/row_widget_notifications_dark_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_dark_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginVertical="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
         android:textSize="11sp"
         tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_item.xml b/app/src/main/res/layout/row_widget_notifications_item.xml
index 3eb37e94..47d228b8 100644
--- a/app/src/main/res/layout/row_widget_notifications_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_weight="1"
             android:orientation="vertical"
             android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
             android:textSize="11sp"
             tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_big_item.xml b/app/src/main/res/layout/row_widget_timetable_big_item.xml
index 4543536e..003600b4 100644
--- a/app/src/main/res/layout/row_widget_timetable_big_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -46,10 +45,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -126,4 +124,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml b/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
index 794069a3..1e80afb6 100644
--- a/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -46,10 +45,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -126,4 +124,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_dark_item.xml b/app/src/main/res/layout/row_widget_timetable_dark_item.xml
index 813f7186..77149eeb 100644
--- a/app/src/main/res/layout/row_widget_timetable_dark_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_dark_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -45,10 +44,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -122,4 +120,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_item.xml b/app/src/main/res/layout/row_widget_timetable_item.xml
index 84942a94..c0383b1a 100644
--- a/app/src/main/res/layout/row_widget_timetable_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -45,10 +44,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -122,4 +120,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml
index 3c998027..3b51a197 100644
--- a/app/src/main/res/layout/timetable_lesson.xml
+++ b/app/src/main/res/layout/timetable_lesson.xml
@@ -57,8 +57,7 @@
                     android:id="@+id/subjectName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="4dp"
+                    android:layout_marginVertical="4dp"
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:fontFamily="sans-serif-light"