diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml
index 483904191f..e31210bb42 100644
--- a/android/res/layout/fragment_editor.xml
+++ b/android/res/layout/fragment_editor.xml
@@ -19,7 +19,7 @@
         android:id="@+id/category"
         style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/editor_height_field"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="0dp"
         android:padding="@dimen/margin_half_plus">
         <ImageView
@@ -31,16 +31,12 @@
           android:layout_marginStart="@dimen/margin_quarter"
           android:tint="?iconTint"
           tools:src="@drawable/ic_operator"/>
-        <Space
-          android:id="@+id/anchor_center"
-          android:layout_width="0dp"
-          android:layout_height="0dp"
-          android:layout_centerVertical="true"/>
+
         <TextView
           android:id="@+id/title"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_above="@id/anchor_center"
+          android:layout_alignParentTop="true"
           android:layout_marginStart="@dimen/margin_quarter"
           android:layout_toEndOf="@id/icon"
           android:text="@string/editor_edit_place_category_title"
@@ -51,7 +47,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_alignStart="@id/title"
-          android:layout_below="@id/anchor_center"
+          android:layout_below="@id/title"
           android:textAppearance="@style/MwmTextAppearance.Body1"
           tools:text="Ololo"/>
       </RelativeLayout>
diff --git a/android/res/layout/fragment_timetable.xml b/android/res/layout/fragment_timetable.xml
index 54ec66e3d2..dc07e46b96 100644
--- a/android/res/layout/fragment_timetable.xml
+++ b/android/res/layout/fragment_timetable.xml
@@ -16,14 +16,15 @@
 
   <View
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_block_base"
+    android:layout_height="wrap_content"
+    android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
     android:background="?cardBackground"/>
 
   <TextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_block_base"
+    android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
     android:background="?clickableBackground"
     android:gravity="center_vertical"
@@ -31,7 +32,7 @@
     android:text="@string/editor_time_advanced"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorAccent" />
 
   <include
     layout="@layout/shadow_bottom"
diff --git a/android/res/layout/item_timetable.xml b/android/res/layout/item_timetable.xml
index 882435c096..fa5e46e3d6 100644
--- a/android/res/layout/item_timetable.xml
+++ b/android/res/layout/item_timetable.xml
@@ -192,7 +192,7 @@
       <LinearLayout
         android:id="@+id/time_open_close"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/editor_height_hours"
+        android:layout_height="wrap_content"
         android:baselineAligned="false"
         android:gravity="center_vertical"
         android:orientation="horizontal">