diff --git a/android/app/src/main/res/drawable/ic_atm_white.xml b/android/app/src/main/res/drawable/ic_atm_white.xml
index 7cd19aa052..fa880007e2 100644
--- a/android/app/src/main/res/drawable/ic_atm_white.xml
+++ b/android/app/src/main/res/drawable/ic_atm_white.xml
@@ -1,4 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="48"
     android:viewportHeight="48"
     android:width="48dp"
diff --git a/android/app/src/main/res/drawable/ic_capacity_white.xml b/android/app/src/main/res/drawable/ic_capacity_white.xml
index b6eb10e1cc..739959be49 100644
--- a/android/app/src/main/res/drawable/ic_capacity_white.xml
+++ b/android/app/src/main/res/drawable/ic_capacity_white.xml
@@ -1,4 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="28"
     android:viewportHeight="28"
     android:width="28dp"
diff --git a/android/app/src/main/res/drawable/ic_storage_permission.xml b/android/app/src/main/res/drawable/ic_storage_permission.xml
index 89b8b60d32..0e6e4618c1 100644
--- a/android/app/src/main/res/drawable/ic_storage_permission.xml
+++ b/android/app/src/main/res/drawable/ic_storage_permission.xml
@@ -1,7 +1,6 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
   <item>
-    <shape xmlns:android="http://schemas.android.com/apk/res/android"
-           android:shape="oval">
+    <shape android:shape="oval">
       <solid android:color="@color/black_4"/>
       <size
         android:height="40dp"
diff --git a/android/app/src/main/res/layout-land/fragment_direction.xml b/android/app/src/main/res/layout-land/fragment_direction.xml
index 87466d2703..8aadf27bab 100644
--- a/android/app/src/main/res/layout-land/fragment_direction.xml
+++ b/android/app/src/main/res/layout-land/fragment_direction.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingStart="@dimen/margin_direction_side"
   android:paddingEnd="@dimen/margin_direction_side"
-  tools:background="@color/bg_dialog_translucent">
-  <RelativeLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center">
+  tools:background="@color/bg_dialog_translucent"
+  android:gravity="center">
 
     <app.organicmaps.widget.ArrowView
       android:id="@+id/av__direction"
@@ -56,4 +53,3 @@
         tools:text="9000 km"/>
     </LinearLayout>
   </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/fragment_prefs_faq.xml b/android/app/src/main/res/layout/fragment_prefs_faq.xml
index a19a6ccf65..a4c6e4a717 100644
--- a/android/app/src/main/res/layout/fragment_prefs_faq.xml
+++ b/android/app/src/main/res/layout/fragment_prefs_faq.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:layout_weight="1"
   android:orientation="vertical">
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1">
     <app.organicmaps.widget.ObservableWebView
       android:id="@+id/webview"
       android:layout_width="match_parent"
@@ -28,4 +25,3 @@
     <include layout="@layout/shadow_top" />
     <include layout="@layout/shadow_bottom" />
   </FrameLayout>
-</LinearLayout>
diff --git a/android/app/src/main/res/layout/indeterminated_progress_dialog.xml b/android/app/src/main/res/layout/indeterminated_progress_dialog.xml
index 33d93df441..0eb143649a 100644
--- a/android/app/src/main/res/layout/indeterminated_progress_dialog.xml
+++ b/android/app/src/main/res/layout/indeterminated_progress_dialog.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/body"
+  android:orientation="horizontal"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content">
-  <LinearLayout
-    android:id="@+id/body"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:padding="16dip">
+  android:layout_height="wrap_content"
+  android:baselineAligned="false"
+  android:padding="16dip">
     <ProgressBar
       android:id="@android:id/progress"
       style="?android:attr/progressBarStyle"
@@ -21,5 +18,4 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"/>
-  </LinearLayout>
-</FrameLayout>
+</LinearLayout>
diff --git a/android/app/src/main/res/layout/item_search_recent.xml b/android/app/src/main/res/layout/item_search_recent.xml
index 516e212f7b..465ab84720 100644
--- a/android/app/src/main/res/layout/item_search_recent.xml
+++ b/android/app/src/main/res/layout/item_search_recent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView 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"
-          style="@style/MwmWidget.TextView.Search"
-          app:drawableStartCompat="@drawable/ic_search_recent"
-          tools:text="Some recent query"/>
+<TextView
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.TextView.Search"
+  app:drawableStartCompat="@drawable/ic_search_recent"
+  tools:text="Some recent query"/>
diff --git a/android/app/src/main/res/layout/menu_route_plan_line.xml b/android/app/src/main/res/layout/menu_route_plan_line.xml
index ff1bc4ac3d..389c7b50e5 100644
--- a/android/app/src/main/res/layout/menu_route_plan_line.xml
+++ b/android/app/src/main/res/layout/menu_route_plan_line.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:background="?cardBackground"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="horizontal"
+  android:background="?cardBackground"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
 
   <include layout="@layout/altitude_chart_panel" />
 
diff --git a/android/app/src/main/res/layout/place_page_fat_shadow.xml b/android/app/src/main/res/layout/place_page_fat_shadow.xml
index 50e30b9c91..fa1d63b507 100644
--- a/android/app/src/main/res/layout/place_page_fat_shadow.xml
+++ b/android/app/src/main/res/layout/place_page_fat_shadow.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  tools:showIn="@layout/place_page_ugc">
+  android:layout_height="wrap_content">
   <android.widget.Space
     android:layout_width="match_parent"
     android:layout_height="@dimen/margin_half"/>
diff --git a/android/app/src/main/res/layout/place_page_rating_records.xml b/android/app/src/main/res/layout/place_page_rating_records.xml
index 2baaa9e628..d3c3a4522f 100644
--- a/android/app/src/main/res/layout/place_page_rating_records.xml
+++ b/android/app/src/main/res/layout/place_page_rating_records.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="?cardBackground"
diff --git a/android/app/src/main/res/layout/placeholder_image.xml b/android/app/src/main/res/layout/placeholder_image.xml
index c3c7eedfcf..479ffb61ae 100644
--- a/android/app/src/main/res/layout/placeholder_image.xml
+++ b/android/app/src/main/res/layout/placeholder_image.xml
@@ -6,4 +6,4 @@
   android:layout_width="@dimen/placeholder_size"
   android:layout_height="@dimen/placeholder_size"
   android:layout_marginBottom="@dimen/margin_half_plus"
-  tools:src="@drawable/img_search_empty_history_light"/>
+  tools:src="@drawable/ic_search"/>