diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f601dd5fdd..8031b6a1fe 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -232,6 +232,7 @@
       android:name="com.mapswithme.maps.editor.EditorActivity"
       android:configChanges="orientation|screenLayout|screenSize"
       android:label="@string/pp_place_edit"
+      android:theme="@style/MwmTheme.EditorActivity"
       android:parentActivityName="com.mapswithme.maps.MwmActivity">
       <!-- The meta-data element is needed for versions lower than 4.1 -->
       <meta-data
diff --git a/android/res/color/color_timepicker_tab.xml b/android/res/color/color_timepicker_tab.xml
new file mode 100644
index 0000000000..99ec5ba9ba
--- /dev/null
+++ b/android/res/color/color_timepicker_tab.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+    android:color="@color/base_blue_light"
+    android:state_selected="true"/>
+
+  <item
+    android:color="@color/text_dark_subtitle"/>
+</selector>
\ No newline at end of file
diff --git a/android/res/color/timepicker_title.xml b/android/res/color/timepicker_title.xml
new file mode 100644
index 0000000000..f6289d9321
--- /dev/null
+++ b/android/res/color/timepicker_title.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+    android:color="@color/base_blue_light"
+    android:state_selected="true"/>
+
+  <item
+    android:color="@color/base_blue_lightest"/>
+</selector>
\ No newline at end of file
diff --git a/android/res/color/timetable_add_complement_text.xml b/android/res/color/timetable_add_complement_text.xml
new file mode 100644
index 0000000000..3c35f35008
--- /dev/null
+++ b/android/res/color/timetable_add_complement_text.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+    android:color="@android:color/white"
+    android:state_enabled="true"/>
+
+  <item
+    android:color="@color/editor_complement_text_disabled"/>
+</selector>
\ No newline at end of file
diff --git a/android/res/drawable/timetable_add_complement.xml b/android/res/drawable/timetable_add_complement.xml
new file mode 100644
index 0000000000..0aff36ff7a
--- /dev/null
+++ b/android/res/drawable/timetable_add_complement.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+    android:drawable="@color/base_blue_light"
+    android:state_enabled="true"/>
+
+  <item
+    android:drawable="@color/editor_complement_disabled"/>
+</selector>
\ No newline at end of file
diff --git a/android/res/layout/fragment_timetable.xml b/android/res/layout/fragment_timetable.xml
new file mode 100644
index 0000000000..5ed0db3495
--- /dev/null
+++ b/android/res/layout/fragment_timetable.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <android.support.v7.widget.Toolbar
+    android:id="@+id/toolbar"
+    style="@style/MwmWidget.ToolbarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:gravity="end"
+    android:theme="@style/MwmWidget.ToolbarTheme">
+
+    <ImageView
+      android:id="@+id/iv__submit"
+      android:layout_width="?actionBarSize"
+      android:layout_height="?actionBarSize"
+      android:layout_gravity="end|center_vertical"
+      android:background="?selectableItemBackgroundBorderless"
+      android:padding="@dimen/margin_half_plus"
+      android:scaleType="center"
+      android:src="@drawable/ic_toolbar_check"/>
+
+  </android.support.v7.widget.Toolbar>
+
+  <FrameLayout
+    android:id="@+id/fragment_container"
+    style="@style/MwmWidget.FrameLayout.Elevation"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_above="@+id/tv__mode_switch"
+    android:layout_below="@id/toolbar"
+    android:background="@color/editor_background"/>
+
+  <TextView
+    android:id="@+id/tv__mode_switch"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/base_block_size"
+    android:layout_alignParentBottom="true"
+    android:background="?selectableItemBackground"
+    android:gravity="center_vertical"
+    android:padding="@dimen/margin_base"
+    android:text="@string/editor_time_advanced"
+    android:textAllCaps="true"
+    android:textAppearance="@style/MwmTextAppearance.Body3"
+    android:textColor="@color/base_blue_light"/>
+
+  <include
+    layout="@layout/shadow_bottom"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_above="@id/tv__mode_switch"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/fragment_timetable_advanced.xml b/android/res/layout/fragment_timetable_advanced.xml
new file mode 100644
index 0000000000..be493889d7
--- /dev/null
+++ b/android/res/layout/fragment_timetable_advanced.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/margin_half">
+
+    <android.support.v7.widget.CardView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@android:color/white"
+      card_view:cardCornerRadius="2dp"
+      card_view:cardElevation="4dp">
+
+      <EditText
+        android:id="@+id/et__timetable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@null"
+        android:gravity="top|start"
+        android:inputType="textMultiLine"
+        android:padding="@dimen/margin_base"
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        tools:hint="hint"
+        tools:text="trololo \ntrololo \ntrololo"/>
+
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/margin_half"
+      card_view:cardBackgroundColor="@android:color/white"
+      card_view:cardCornerRadius="2dp"
+      card_view:cardElevation="4dp">
+
+      <RelativeLayout
+        android:id="@+id/examples"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="true">
+
+        <TextView
+          android:id="@+id/tv__examples_title"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/base_block_size"
+          android:layout_toLeftOf="@+id/iv__indicator"
+          android:layout_toStartOf="@+id/iv__indicator"
+          android:background="@null"
+          android:drawableLeft="@drawable/ic_type_text"
+          android:drawablePadding="@dimen/margin_base"
+          android:drawableStart="@drawable/ic_type_text"
+          android:gravity="center_vertical"
+          android:padding="@dimen/margin_base"
+          android:text="Example values"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          android:textColor="@color/base_blue_light"/>
+
+        <ImageView
+          android:id="@+id/iv__indicator"
+          android:layout_width="wrap_content"
+          android:layout_height="@dimen/base_block_size"
+          android:layout_alignParentEnd="true"
+          android:layout_alignParentRight="true"
+          android:gravity="center_vertical"
+          android:scaleType="center"
+          tools:src="@drawable/ic_expand_more"/>
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:layout_below="@id/tv__examples_title"
+          android:background="@color/divider_standard"/>
+
+        <TextView
+          android:id="@+id/tv__examples"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_below="@id/tv__examples_title"
+          android:fontFamily="@string/robotoMedium"
+          android:padding="@dimen/margin_base"
+          android:text="24/7 any non-stop facilities, 24 hours a day, 7 days a week;
\n\nSa-Su 00:00-24:00 opens only the weekend but non-stop, 24 hours;
\n\nsunrise-sunset.
"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:ignore="UnusedAttribute"/>
+
+      </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
+  </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/android/res/layout/fragment_timetable_picker.xml b/android/res/layout/fragment_timetable_picker.xml
new file mode 100644
index 0000000000..d5a4852704
--- /dev/null
+++ b/android/res/layout/fragment_timetable_picker.xml
@@ -0,0 +1,26 @@
+<?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:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <android.support.design.widget.TabLayout
+    android:id="@+id/tabs"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/base_block_size"
+    android:elevation="@dimen/appbar_elevation"
+    android:background="@android:color/white"
+    app:tabGravity="fill"
+    app:tabIndicatorColor="@color/base_blue_light"
+    app:tabMode="fixed"
+    tools:ignore="UnusedAttribute"/>
+
+  <TimePicker
+    android:id="@+id/picker"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/fragment_timetable_simple.xml b/android/res/layout/fragment_timetable_simple.xml
new file mode 100644
index 0000000000..91874020e0
--- /dev/null
+++ b/android/res/layout/fragment_timetable_simple.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.RecyclerView
+  android:id="@+id/recycler"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:paddingLeft="@dimen/margin_half"
+  android:paddingRight="@dimen/margin_half"/>
\ No newline at end of file
diff --git a/android/res/layout/item_timetable.xml b/android/res/layout/item_timetable.xml
new file mode 100644
index 0000000000..29cc119cb5
--- /dev/null
+++ b/android/res/layout/item_timetable.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+  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:layout_marginBottom="@dimen/margin_half"
+  android:layout_marginTop="@dimen/margin_half">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/editor_height_days"
+      android:layout_gravity="center_vertical"
+      android:baselineAligned="false"
+      android:orientation="horizontal"
+      android:padding="@dimen/margin_half_plus">
+
+      <LinearLayout
+        android:id="@+id/day1"
+        style="@style/Editor.DayLayout">
+
+        <TextView
+          android:id="@+id/tv__day_1"
+          style="@style/Editor.DayText"
+          tools:text="Su"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_1"
+          style="@style/Editor.DayCheckBox"/>
+
+      </LinearLayout>
+
+      <Space
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.5"/>
+
+      <LinearLayout
+        android:id="@+id/day2"
+        style="@style/Editor.DayLayout"
+        android:layout_weight="1">
+
+        <TextView
+          android:id="@+id/tv__day_2"
+          style="@style/Editor.DayText"
+          tools:text="Mo"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_2"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/day3"
+        style="@style/Editor.DayLayout"
+        android:layout_weight="1">
+
+        <TextView
+          android:id="@+id/tv__day_3"
+          style="@style/Editor.DayText"
+          tools:text="Tu"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_3"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/day4"
+        style="@style/Editor.DayLayout"
+        android:layout_weight="1">
+
+        <TextView
+          android:id="@+id/tv__day_4"
+          style="@style/Editor.DayText"
+          tools:text="We"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_4"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/day5"
+        style="@style/Editor.DayLayout"
+        android:layout_weight="1">
+
+        <TextView
+          android:id="@+id/tv__day_5"
+          style="@style/Editor.DayText"
+          tools:text="Th"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_5"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/day6"
+        style="@style/Editor.DayLayout"
+        android:layout_weight="1">
+
+        <TextView
+          android:id="@+id/tv__day_6"
+          style="@style/Editor.DayText"
+          tools:text="Fr"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_6"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      </LinearLayout>
+
+      <Space
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.5"/>
+
+      <LinearLayout
+        android:id="@+id/day7"
+        style="@style/Editor.DayLayout">
+
+        <TextView
+          android:id="@+id/tv__day_7"
+          style="@style/Editor.DayText"
+          tools:text="Sa"/>
+
+        <CheckBox
+          android:id="@+id/chb__day_7"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      </LinearLayout>
+
+    </LinearLayout>
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="@color/divider_standard"/>
+
+    <LinearLayout
+      android:id="@+id/allday"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/editor_height_allday"
+      android:layout_gravity="center_vertical"
+      android:background="?clickableBackground"
+      android:gravity="center_vertical"
+      android:orientation="horizontal"
+      android:padding="@dimen/margin_half_plus">
+
+      <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/editor_time_allday"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
+
+      <android.support.v7.widget.SwitchCompat
+        android:id="@+id/sw__allday"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+      android:id="@+id/schedule"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:visibility="gone"
+      tools:visibility="visible">
+
+      <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/divider_standard"/>
+
+      <LinearLayout
+        android:id="@+id/time_open_close"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/editor_height_hours"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <LinearLayout
+          android:id="@+id/time_open"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:background="?clickableBackground"
+          android:orientation="vertical"
+          android:padding="@dimen/margin_half_plus">
+
+          <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_eighth"
+            android:text="@string/editor_time_open"
+            android:textAppearance="@style/MwmTextAppearance.Body3"/>
+
+          <TextView
+            android:id="@+id/tv__time_open"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/MwmTextAppearance.Title"
+            tools:text="09:00"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:id="@+id/time_close"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:background="?clickableBackground"
+          android:orientation="vertical"
+          android:padding="@dimen/margin_half_plus">
+
+          <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_eighth"
+            android:text="@string/editor_time_close"
+            android:textAppearance="@style/MwmTextAppearance.Body3"/>
+
+          <TextView
+            android:id="@+id/tv__time_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/MwmTextAppearance.Title"
+            tools:text="16:00"/>
+
+        </LinearLayout>
+
+      </LinearLayout>
+
+      <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/divider_standard"/>
+
+      <LinearLayout
+        android:id="@+id/closed_host"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+      <TextView
+        android:id="@+id/tv__add_closed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?clickableBackground"
+        android:padding="@dimen/margin_half_plus"
+        android:text="@string/editor_time_add_closed"
+        android:textAllCaps="true"
+        android:textAppearance="@style/MwmTextAppearance.Body1"
+        android:textColor="@color/base_blue_light"/>
+
+    </LinearLayout>
+
+    <TextView
+      android:id="@+id/tv__remove_timetable"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="?clickableBackground"
+      android:padding="@dimen/margin_half_plus"
+      android:text="@string/editor_time_delete"
+      android:textAllCaps="true"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
+      android:textColor="@color/base_red"/>
+
+  </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/android/res/layout/item_timetable_add.xml b/android/res/layout/item_timetable_add.xml
new file mode 100644
index 0000000000..f9398e95b4
--- /dev/null
+++ b/android/res/layout/item_timetable_add.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:paddingBottom="@dimen/margin_base_plus"
+  android:paddingTop="@dimen/margin_base_plus">
+
+  <Button
+    android:id="@+id/btn__add_time"
+    android:layout_width="124dp"
+    android:layout_height="36dp"
+    android:layout_gravity="center"
+    android:background="@drawable/timetable_add_complement"
+    android:text="@string/editor_time_add"
+    android:textAllCaps="true"
+    android:textAppearance="@style/MwmTextAppearance.Body3.Light"
+    android:textColor="@color/timetable_add_complement_text"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/android/res/layout/item_timetable_closed_hours.xml b/android/res/layout/item_timetable_closed_hours.xml
new file mode 100644
index 0000000000..c3898b40f5
--- /dev/null
+++ b/android/res/layout/item_timetable_closed_hours.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="@dimen/editor_height_closed"
+  android:paddingTop="@dimen/margin_base">
+
+  <ImageView
+    android:id="@+id/iv__remove_closed"
+    android:layout_width="@dimen/base_block_size"
+    android:layout_height="@dimen/base_block_size"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_centerVertical="true"
+    android:background="?selectableItemBackgroundBorderless"
+    android:scaleType="center"
+    android:src="@drawable/ic_close"/>
+
+  <TextView
+    android:id="@+id/tv__closed_title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_marginStart="@dimen/margin_base"
+    android:layout_toLeftOf="@id/iv__remove_closed"
+    android:layout_toStartOf="@id/iv__remove_closed"
+    android:text="Hours closed"
+    android:textAppearance="@style/MwmTextAppearance.Body3"/>
+
+  <TextView
+    android:id="@+id/tv__closed"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignLeft="@id/tv__closed_title"
+    android:layout_alignStart="@id/tv__closed_title"
+    android:layout_below="@id/tv__closed_title"
+    android:layout_marginTop="@dimen/margin_eighth"
+    android:layout_toLeftOf="@id/iv__remove_closed"
+    android:layout_toStartOf="@id/iv__remove_closed"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
+    tools:text="15:00--16:00"/>
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:layout_alignParentBottom="true"
+    android:background="@color/base_black_divider"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml
index e5daa38c29..9ce4fed582 100644
--- a/android/res/layout/place_page_details.xml
+++ b/android/res/layout/place_page_details.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
   <com.mapswithme.maps.widget.ObservableScrollView
       android:id="@+id/pp__details"
       android:layout_width="match_parent"
diff --git a/android/res/layout/tab.xml b/android/res/layout/tab.xml
index d6ff857a4e..82c207f20f 100644
--- a/android/res/layout/tab.xml
+++ b/android/res/layout/tab.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView 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:padding="@dimen/margin_half_plus"
-          android:textAppearance="@style/MwmTextAppearance.Body4"
-          android:gravity="center"
-          android:textAllCaps="true"
-          android:singleLine="true"
-          tools:drawableLeft="@drawable/ic_menu_open"
-          tools:text="Some tab"/>
+<TextView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.Tab"
+  android:textAppearance="@style/MwmTextAppearance.Body4"
+  tools:drawableLeft="@drawable/ic_menu_open"
+  tools:text="Some tab"/>
diff --git a/android/res/layout/tab_timepicker.xml b/android/res/layout/tab_timepicker.xml
new file mode 100644
index 0000000000..23da60db86
--- /dev/null
+++ b/android/res/layout/tab_timepicker.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.Tab"
+  android:textAppearance="@style/MwmTextAppearance.Body3"
+  android:textColor="@color/color_timepicker_tab"
+  tools:drawableLeft="@drawable/ic_menu_open"
+  tools:text="Some tab"/>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 972ce23600..e04813c929 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -93,4 +93,11 @@
 
   <dimen name="news_max_width">560dp</dimen>
   <dimen name="news_max_height">500dp</dimen>
+
+  <!-- Editor -->
+  <dimen name="editor_height_days">72dp</dimen>
+  <dimen name="editor_height_closed">72dp</dimen>
+  <dimen name="editor_height_allday">56dp</dimen>
+  <dimen name="editor_height_hours">80dp</dimen>
+  <dimen name="editor_height_add_delete_schedule">92dp</dimen>
 </resources>
diff --git a/android/res/values/font_sizes.xml b/android/res/values/font_sizes.xml
index 1fe7d0464b..7848be7378 100644
--- a/android/res/values/font_sizes.xml
+++ b/android/res/values/font_sizes.xml
@@ -35,5 +35,6 @@
   <dimen name="text_size_routing_dimension">14sp</dimen>
   <dimen name="text_size_routing_plan_detail">18sp</dimen>
   <dimen name="text_size_routing_plan_detail_arrival">14sp</dimen>
+  <dimen name="text_size_time_picker">56sp</dimen>
 
 </resources>
diff --git a/android/res/values/styles-editor.xml b/android/res/values/styles-editor.xml
new file mode 100644
index 0000000000..dc4cee888f
--- /dev/null
+++ b/android/res/values/styles-editor.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="Editor"/>
+
+  <style name="Editor.DayCheckBox">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:checked">true</item>
+  </style>
+
+  <style name="Editor.DayText">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
+  </style>
+
+  <style name="Editor.DayLayout">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:gravity">center_horizontal</item>
+    <item name="android:orientation">vertical</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index 7b9ece5a34..1552a64edd 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -105,4 +105,19 @@
   <style name="MwmTextAppearance.PlacePage.Accent">
     <item name="android:textColor">?colorAccent</item>
   </style>
+
+  <style name="MwmTextAppearance.Editor">
+    <item name="android:textColor">@color/base_blue_light</item>
+  </style>
+
+  <style name="MwmTextAppearance.Editor.TimePicker">
+    <item name="android:textSize">@dimen/text_size_time_picker</item>
+    <item name="android:textColor">@color/timepicker_title</item>
+  </style>
+
+  <style name="MwmTextAppearance.Editor.Buttons">
+    <item name="android:textSize">@dimen/text_size_body_3</item>
+  </style>
+
+
 </resources>
\ No newline at end of file
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 5df4f91c47..e06baf3492 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -138,6 +138,16 @@
     <item name="android:indeterminateDrawable">@drawable/rating_bar</item>
   </style>
 
+  <style name="MwmWidget.Editor.TimePicker" parent="MwmWidget">
+    <item name="colorPrimary">@color/base_blue_light</item>
+    <item name="android:headerBackground">@null</item>
+    <item name="android:headerTimeTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Editor.TimePicker</item>
+    <item name="android:numbersSelectorColor" tools:targetApi="lollipop">@color/base_blue</item>
+    <item name="android:numbersBackgroundColor" tools:targetApi="lollipop">@color/divider_standard</item>
+    <item name="android:headerAmPmTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Editor.Buttons</item>
+    <item name="android:timePickerMode" tools:targetApi="lollipop">clock</item>
+  </style>
+
   <style name="MwmWidget.Counter">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 2613f66bc8..35403f7e79 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -55,6 +55,11 @@
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
   </style>
 
+  <style name="MwmTheme.EditorActivity">
+    <item name="colorAccent">@color/base_blue_light</item>
+    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
     <item name="android:textAppearance">@style/MwmTextAppearance.Title</item>
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
@@ -86,6 +91,13 @@
     <item name="android:windowIsTranslucent">true</item>
   </style>
 
+  <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
+    <item name="android:background">@android:color/white</item>
+    <item name="colorPrimary">@color/base_blue_light</item>
+    <item name="colorAccent">@color/base_blue_light</item>
+  </style>
+
   <style name="BottomSheet.Dialog.Dark">
     <item name="android:textColorPrimary">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_light</item>