diff --git a/android/app/src/main/res/layout/bottom_sheet_handle.xml b/android/app/src/main/res/layout/bottom_sheet_handle.xml
index b3fd587f6d..67c3bcfffe 100644
--- a/android/app/src/main/res/layout/bottom_sheet_handle.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_handle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="wrap_content">
@@ -12,4 +12,4 @@
     app:srcCompat="@drawable/bottom_sheet_handle"
     app:tint="?colorControlHighlight" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/app/src/main/res/layout/current_location_marker.xml b/android/app/src/main/res/layout/current_location_marker.xml
index e4989c7e25..50ec2a1c59 100644
--- a/android/app/src/main/res/layout/current_location_marker.xml
+++ b/android/app/src/main/res/layout/current_location_marker.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
+  android:orientation="vertical"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  tools:background="@color/black_primary"
-  tools:ignore="Overdraw">
-  <ImageView
-    android:id="@+id/image"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_below="@id/label"
-    android:layout_centerHorizontal="true"
-    android:background="@drawable/ic_you_marker"
-    app:srcCompat="@drawable/ic_chart_pin" />
+  tools:background="@color/black_primary">
   <TextView
     android:id="@+id/label"
     android:layout_width="wrap_content"
@@ -27,4 +19,12 @@
     android:text="you"
     android:textColor="@color/base_accent"
     android:textSize="@dimen/text_size_icon_title" />
-</RelativeLayout>
+  <ImageView
+    android:id="@+id/image"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/ic_you_marker"
+    android:layout_gravity="center"
+    app:srcCompat="@drawable/ic_chart_pin" />
+
+</LinearLayout>
diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index c36658e026..052b465ab4 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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"
@@ -14,7 +14,8 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_half"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:layout_constraintTop_toTopOf="parent">
     <com.google.android.material.textfield.TextInputLayout
       android:id="@+id/edit_bookmark_name_input"
       style="?fontBody1"
@@ -39,8 +40,9 @@
     android:id="@+id/rl__bookmark_set"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_below="@id/ll__bookmark_name"
-    android:layout_marginStart="@dimen/margin_half_plus">
+    app:layout_constraintTop_toBottomOf="@+id/ll__bookmark_name"
+    android:layout_marginStart="@dimen/margin_half"
+    android:layout_marginEnd="@dimen/margin_half">
     <TextView
       android:id="@+id/tv__bookmark_set_title"
       android:layout_width="match_parent"
@@ -87,7 +89,8 @@
     android:layout_height="wrap_content"
     android:layout_below="@id/rl__bookmark_set"
     android:layout_margin="@dimen/margin_half"
-    android:textColorHint="?android:textColorSecondary">
+    android:textColorHint="?android:textColorSecondary"
+    app:layout_constraintTop_toBottomOf="@+id/rl__bookmark_set">
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/et__description"
       style="@style/MwmWidget.PlacePage.EditText"
@@ -97,4 +100,4 @@
       android:hint="@string/edit_description_hint"
       android:inputType="textMultiLine" />
   </com.google.android.material.textfield.TextInputLayout>
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/layout/fragment_bookmark_list.xml b/android/app/src/main/res/layout/fragment_bookmark_list.xml
index 76c27bd6b4..b7e2b56b4b 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_list.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -45,4 +45,4 @@
       android:visibility="gone"
       tools:visibility="visible" />
   </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</RelativeLayout>
+</FrameLayout>
diff --git a/android/app/src/main/res/layout/fragment_edit_bookmark.xml b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
index 456ea53fb3..b399d6c39f 100644
--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<androidx.constraintlayout.widget.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
@@ -10,14 +10,14 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme">
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    app:layout_constraintTop_toTopOf="parent">
       <ImageView
         app:tint="@color/image_view"
         android:id="@+id/save"
         app:srcCompat="@drawable/ic_done"
         android:layout_width="?actionBarSize"
         android:layout_height="?actionBarSize"
-        android:layout_alignParentEnd="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
@@ -27,7 +27,8 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_below="@id/toolbar">
-    <include layout="@layout/edit_bookmark_common"/>
+    android:layout_below="@id/toolbar"
+    app:layout_constraintTop_toBottomOf="@+id/toolbar">
+    <include layout="@layout/edit_bookmark_common" />
   </FrameLayout>
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/layout/fragment_edit_description.xml b/android/app/src/main/res/layout/fragment_edit_description.xml
index f82d39d6be..3f136f5fa7 100644
--- a/android/app/src/main/res/layout/fragment_edit_description.xml
+++ b/android/app/src/main/res/layout/fragment_edit_description.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<androidx.constraintlayout.widget.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
@@ -9,14 +9,14 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:theme="@style/MwmWidget.ToolbarTheme">
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    app:layout_constraintTop_toTopOf="parent">
     <ImageView
       app:tint="@color/image_view"
       android:id="@+id/save"
       app:srcCompat="@drawable/ic_done"
       android:layout_width="?actionBarSize"
       android:layout_height="?actionBarSize"
-      android:layout_alignParentEnd="true"
       android:background="?attr/selectableItemBackgroundBorderless"
       android:layout_gravity="end"
       android:scaleType="centerInside"
@@ -28,7 +28,8 @@
     android:layout_height="wrap_content"
     android:layout_below="@id/toolbar"
     android:paddingStart="@dimen/margin_base"
-    android:paddingEnd="@dimen/margin_base">
+    android:paddingEnd="@dimen/margin_base"
+    app:layout_constraintTop_toBottomOf="@+id/toolbar">
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/et__description"
       style="@style/MwmWidget.PlacePage.EditText"
@@ -40,4 +41,4 @@
       android:inputType="textMultiLine"
       android:textColorHint="?android:textColorSecondary" />
   </FrameLayout>
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index 60b55c8d04..fecbdc8c56 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     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"
     android:fitsSystemWindows="true">
@@ -9,9 +10,8 @@
         style="@style/MwmWidget.FrameLayout.Elevation"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?windowBackgroundForced"
-        android:layout_above="@+id/tv__mode_switch"
-        android:layout_below="@id/toolbar">
+        android:id="@+id/frameLayout"
+        android:background="?windowBackgroundForced">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"
@@ -26,14 +26,14 @@
         android:id="@+id/tv__append_phone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:background="?clickableBackground"
         android:gravity="center_vertical"
         android:padding="@dimen/margin_base"
         android:text="@string/editor_add_phone"
         android:textAllCaps="true"
         android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="?colorAccent"/>
+        android:textColor="?colorAccent"
+        app:layout_constraintBottom_toBottomOf="@+id/frameLayout" />
 
     <include
         layout="@layout/shadow_bottom"
@@ -41,4 +41,4 @@
         android:layout_height="wrap_content"
         android:layout_above="@id/tv__mode_switch"/>
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
index 109d40e525..736b569845 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -43,10 +43,11 @@
       card_view:cardCornerRadius="2dp"
       card_view:cardElevation="4dp">
 
-      <RelativeLayout
+      <LinearLayout
         android:id="@+id/examples"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         android:animateLayoutChanges="true">
 
         <TextView
@@ -64,17 +65,15 @@
         <View
           android:layout_width="match_parent"
           android:layout_height="1dp"
-          android:layout_below="@id/tv__examples_title"
-          android:background="?dividerHorizontal"/>
+          android:background="?dividerHorizontal" />
 
         <WebView
           android:id="@+id/wv__examples"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_below="@id/tv__examples_title"
           android:padding="@dimen/margin_base"/>
 
-      </RelativeLayout>
+      </LinearLayout>
 
     </androidx.cardview.widget.CardView>