diff --git a/android/res/drawable-hdpi/ic_app_settings.png b/android/res/drawable-hdpi/ic_app_settings.png
deleted file mode 100644
index e4476e1876..0000000000
Binary files a/android/res/drawable-hdpi/ic_app_settings.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_close_routing.png b/android/res/drawable-hdpi/ic_close_routing.png
deleted file mode 100644
index 8348bed334..0000000000
Binary files a/android/res/drawable-hdpi/ic_close_routing.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_my_position.png b/android/res/drawable-hdpi/ic_my_position.png
deleted file mode 100644
index c180f23afd..0000000000
Binary files a/android/res/drawable-hdpi/ic_my_position.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_my_position_auto_follow.png b/android/res/drawable-hdpi/ic_my_position_auto_follow.png
deleted file mode 100644
index 63ee613087..0000000000
Binary files a/android/res/drawable-hdpi/ic_my_position_auto_follow.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_my_position_pressed.png b/android/res/drawable-hdpi/ic_my_position_pressed.png
deleted file mode 100644
index 1d5f613699..0000000000
Binary files a/android/res/drawable-hdpi/ic_my_position_pressed.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_my_position_search.png b/android/res/drawable-hdpi/ic_my_position_search.png
deleted file mode 100644
index 52c64bd8f5..0000000000
Binary files a/android/res/drawable-hdpi/ic_my_position_search.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_place_page_bookmark_button.png b/android/res/drawable-hdpi/ic_place_page_bookmark_button.png
deleted file mode 100644
index 3c5e8b2287..0000000000
Binary files a/android/res/drawable-hdpi/ic_place_page_bookmark_button.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_place_page_bookmark_button_selected.png b/android/res/drawable-hdpi/ic_place_page_bookmark_button_selected.png
deleted file mode 100644
index a1173a8204..0000000000
Binary files a/android/res/drawable-hdpi/ic_place_page_bookmark_button_selected.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_settings.png b/android/res/drawable-hdpi/ic_settings.png
deleted file mode 100644
index 4090381fa1..0000000000
Binary files a/android/res/drawable-hdpi/ic_settings.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_toolbar_active.png b/android/res/drawable-hdpi/ic_toolbar_active.png
deleted file mode 100644
index d869135361..0000000000
Binary files a/android/res/drawable-hdpi/ic_toolbar_active.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_toolbar_active_vert.png b/android/res/drawable-hdpi/ic_toolbar_active_vert.png
deleted file mode 100644
index 6ff27b48a1..0000000000
Binary files a/android/res/drawable-hdpi/ic_toolbar_active_vert.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_walk.png b/android/res/drawable-hdpi/ic_walk.png
deleted file mode 100644
index f45f06de6a..0000000000
Binary files a/android/res/drawable-hdpi/ic_walk.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_walk_disable.png b/android/res/drawable-hdpi/ic_walk_disable.png
deleted file mode 100644
index 83b85581a8..0000000000
Binary files a/android/res/drawable-hdpi/ic_walk_disable.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/img_counter.png b/android/res/drawable-hdpi/img_counter.png
deleted file mode 100644
index ee44c841d7..0000000000
Binary files a/android/res/drawable-hdpi/img_counter.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_app_settings.png b/android/res/drawable-ldpi/ic_app_settings.png
deleted file mode 100644
index 1757b4656f..0000000000
Binary files a/android/res/drawable-ldpi/ic_app_settings.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_close_routing.png b/android/res/drawable-ldpi/ic_close_routing.png
deleted file mode 100644
index 91869931be..0000000000
Binary files a/android/res/drawable-ldpi/ic_close_routing.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_my_position.png b/android/res/drawable-ldpi/ic_my_position.png
deleted file mode 100644
index 08d0ec0f63..0000000000
Binary files a/android/res/drawable-ldpi/ic_my_position.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_my_position_auto_follow.png b/android/res/drawable-ldpi/ic_my_position_auto_follow.png
deleted file mode 100644
index 749f8e9f72..0000000000
Binary files a/android/res/drawable-ldpi/ic_my_position_auto_follow.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_my_position_pressed.png b/android/res/drawable-ldpi/ic_my_position_pressed.png
deleted file mode 100644
index 9643446dad..0000000000
Binary files a/android/res/drawable-ldpi/ic_my_position_pressed.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_my_position_search.png b/android/res/drawable-ldpi/ic_my_position_search.png
deleted file mode 100644
index 5e9671b51a..0000000000
Binary files a/android/res/drawable-ldpi/ic_my_position_search.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_place_page_bookmark_button.png b/android/res/drawable-ldpi/ic_place_page_bookmark_button.png
deleted file mode 100644
index 74f71be942..0000000000
Binary files a/android/res/drawable-ldpi/ic_place_page_bookmark_button.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_place_page_bookmark_button_selected.png b/android/res/drawable-ldpi/ic_place_page_bookmark_button_selected.png
deleted file mode 100644
index a58d23d749..0000000000
Binary files a/android/res/drawable-ldpi/ic_place_page_bookmark_button_selected.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_settings.png b/android/res/drawable-ldpi/ic_settings.png
deleted file mode 100644
index 828bd6bcea..0000000000
Binary files a/android/res/drawable-ldpi/ic_settings.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_app_settings.png b/android/res/drawable-mdpi/ic_app_settings.png
deleted file mode 100644
index 417f41637b..0000000000
Binary files a/android/res/drawable-mdpi/ic_app_settings.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_close_routing.png b/android/res/drawable-mdpi/ic_close_routing.png
deleted file mode 100644
index 8e02f04f4f..0000000000
Binary files a/android/res/drawable-mdpi/ic_close_routing.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_my_position.png b/android/res/drawable-mdpi/ic_my_position.png
deleted file mode 100644
index d3d8301b74..0000000000
Binary files a/android/res/drawable-mdpi/ic_my_position.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_my_position_auto_follow.png b/android/res/drawable-mdpi/ic_my_position_auto_follow.png
deleted file mode 100644
index ab10ecfe21..0000000000
Binary files a/android/res/drawable-mdpi/ic_my_position_auto_follow.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_my_position_pressed.png b/android/res/drawable-mdpi/ic_my_position_pressed.png
deleted file mode 100644
index 0804b6be79..0000000000
Binary files a/android/res/drawable-mdpi/ic_my_position_pressed.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_my_position_search.png b/android/res/drawable-mdpi/ic_my_position_search.png
deleted file mode 100644
index 2c6da47bda..0000000000
Binary files a/android/res/drawable-mdpi/ic_my_position_search.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_place_page_bookmark_button.png b/android/res/drawable-mdpi/ic_place_page_bookmark_button.png
deleted file mode 100644
index 665e911ddf..0000000000
Binary files a/android/res/drawable-mdpi/ic_place_page_bookmark_button.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_place_page_bookmark_button_selected.png b/android/res/drawable-mdpi/ic_place_page_bookmark_button_selected.png
deleted file mode 100644
index fbb47da99e..0000000000
Binary files a/android/res/drawable-mdpi/ic_place_page_bookmark_button_selected.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_settings.png b/android/res/drawable-mdpi/ic_settings.png
deleted file mode 100644
index a4c77eff4d..0000000000
Binary files a/android/res/drawable-mdpi/ic_settings.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_toolbar_active.png b/android/res/drawable-mdpi/ic_toolbar_active.png
deleted file mode 100644
index 287875bd93..0000000000
Binary files a/android/res/drawable-mdpi/ic_toolbar_active.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_toolbar_active_vert.png b/android/res/drawable-mdpi/ic_toolbar_active_vert.png
deleted file mode 100644
index 065de06ec8..0000000000
Binary files a/android/res/drawable-mdpi/ic_toolbar_active_vert.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_walk.png b/android/res/drawable-mdpi/ic_walk.png
deleted file mode 100644
index 263d4ce2e2..0000000000
Binary files a/android/res/drawable-mdpi/ic_walk.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_walk_disable.png b/android/res/drawable-mdpi/ic_walk_disable.png
deleted file mode 100644
index 6e073358ca..0000000000
Binary files a/android/res/drawable-mdpi/ic_walk_disable.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/img_counter.png b/android/res/drawable-mdpi/img_counter.png
deleted file mode 100644
index fdf0542123..0000000000
Binary files a/android/res/drawable-mdpi/img_counter.png and /dev/null differ
diff --git a/android/res/drawable-v21/ripple_blue.xml b/android/res/drawable-v21/ripple_blue.xml
deleted file mode 100644
index 14239e6bb1..0000000000
--- a/android/res/drawable-v21/ripple_blue.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-
-  <item android:drawable="@color/base_blue_light"/>
-</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-xhdpi/ic_app_settings.png b/android/res/drawable-xhdpi/ic_app_settings.png
deleted file mode 100644
index e9924c9f31..0000000000
Binary files a/android/res/drawable-xhdpi/ic_app_settings.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_close_routing.png b/android/res/drawable-xhdpi/ic_close_routing.png
deleted file mode 100644
index 6048a46f4c..0000000000
Binary files a/android/res/drawable-xhdpi/ic_close_routing.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_my_position.png b/android/res/drawable-xhdpi/ic_my_position.png
deleted file mode 100644
index 80c9eb3dea..0000000000
Binary files a/android/res/drawable-xhdpi/ic_my_position.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_my_position_auto_follow.png b/android/res/drawable-xhdpi/ic_my_position_auto_follow.png
deleted file mode 100644
index eb6f0ad845..0000000000
Binary files a/android/res/drawable-xhdpi/ic_my_position_auto_follow.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_my_position_pressed.png b/android/res/drawable-xhdpi/ic_my_position_pressed.png
deleted file mode 100644
index d207001305..0000000000
Binary files a/android/res/drawable-xhdpi/ic_my_position_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_my_position_search.png b/android/res/drawable-xhdpi/ic_my_position_search.png
deleted file mode 100644
index 88a23eb6b5..0000000000
Binary files a/android/res/drawable-xhdpi/ic_my_position_search.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_place_page_bookmark_button.png b/android/res/drawable-xhdpi/ic_place_page_bookmark_button.png
deleted file mode 100644
index 0d3c0ba462..0000000000
Binary files a/android/res/drawable-xhdpi/ic_place_page_bookmark_button.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_place_page_bookmark_button_selected.png b/android/res/drawable-xhdpi/ic_place_page_bookmark_button_selected.png
deleted file mode 100644
index e6f87320ae..0000000000
Binary files a/android/res/drawable-xhdpi/ic_place_page_bookmark_button_selected.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_settings.png b/android/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index 061f5d0f41..0000000000
Binary files a/android/res/drawable-xhdpi/ic_settings.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_toolbar_active.png b/android/res/drawable-xhdpi/ic_toolbar_active.png
deleted file mode 100644
index f32d19f0a7..0000000000
Binary files a/android/res/drawable-xhdpi/ic_toolbar_active.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_toolbar_active_vert.png b/android/res/drawable-xhdpi/ic_toolbar_active_vert.png
deleted file mode 100644
index ab97763698..0000000000
Binary files a/android/res/drawable-xhdpi/ic_toolbar_active_vert.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_walk.png b/android/res/drawable-xhdpi/ic_walk.png
deleted file mode 100644
index 0e5eb7c4b9..0000000000
Binary files a/android/res/drawable-xhdpi/ic_walk.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_walk_disable.png b/android/res/drawable-xhdpi/ic_walk_disable.png
deleted file mode 100644
index 91cb9fd895..0000000000
Binary files a/android/res/drawable-xhdpi/ic_walk_disable.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/img_counter.png b/android/res/drawable-xhdpi/img_counter.png
deleted file mode 100644
index a23d8e807a..0000000000
Binary files a/android/res/drawable-xhdpi/img_counter.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_app_settings.png b/android/res/drawable-xxhdpi/ic_app_settings.png
deleted file mode 100644
index 5a5314b078..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_app_settings.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_close_routing.png b/android/res/drawable-xxhdpi/ic_close_routing.png
deleted file mode 100644
index e651c41b60..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_close_routing.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_my_position.png b/android/res/drawable-xxhdpi/ic_my_position.png
deleted file mode 100644
index 11f5e90b4b..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_my_position.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_my_position_auto_follow.png b/android/res/drawable-xxhdpi/ic_my_position_auto_follow.png
deleted file mode 100644
index 2aa2bfca0f..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_my_position_auto_follow.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_my_position_pressed.png b/android/res/drawable-xxhdpi/ic_my_position_pressed.png
deleted file mode 100644
index adb7e77cb8..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_my_position_pressed.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_my_position_search.png b/android/res/drawable-xxhdpi/ic_my_position_search.png
deleted file mode 100644
index 0cea417d72..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_my_position_search.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_place_page_bookmark_button.png b/android/res/drawable-xxhdpi/ic_place_page_bookmark_button.png
deleted file mode 100644
index d3b9d2dd4b..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_place_page_bookmark_button.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_place_page_bookmark_button_selected.png b/android/res/drawable-xxhdpi/ic_place_page_bookmark_button_selected.png
deleted file mode 100644
index 8b0d7b5e39..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_place_page_bookmark_button_selected.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_settings.png b/android/res/drawable-xxhdpi/ic_settings.png
deleted file mode 100644
index 00f12a1ad2..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_settings.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_toolbar_active.png b/android/res/drawable-xxhdpi/ic_toolbar_active.png
deleted file mode 100644
index 6f07094559..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_toolbar_active.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_toolbar_active_vert.png b/android/res/drawable-xxhdpi/ic_toolbar_active_vert.png
deleted file mode 100644
index 21801da3d3..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_toolbar_active_vert.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_walk.png b/android/res/drawable-xxhdpi/ic_walk.png
deleted file mode 100644
index 133ebfb8b3..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_walk.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_walk_disable.png b/android/res/drawable-xxhdpi/ic_walk_disable.png
deleted file mode 100644
index 1fed4274c2..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_walk_disable.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/img_counter.png b/android/res/drawable-xxhdpi/img_counter.png
deleted file mode 100644
index f21d19f72b..0000000000
Binary files a/android/res/drawable-xxhdpi/img_counter.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_walk_disable.png b/android/res/drawable-xxxhdpi/ic_walk_disable.png
deleted file mode 100644
index d3d3f356b6..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_walk_disable.png and /dev/null differ
diff --git a/android/res/drawable/bg_bottom_btn.xml b/android/res/drawable/bg_bottom_btn.xml
deleted file mode 100644
index 780f3fe8e5..0000000000
--- a/android/res/drawable/bg_bottom_btn.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <corners android:radius="3dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/text_place_page_buttons" />
-    <solid android:color="@android:color/transparent" />
-
-</shape>
\ No newline at end of file
diff --git a/android/res/drawable/bg_bottom_btn_active.xml b/android/res/drawable/bg_bottom_btn_active.xml
deleted file mode 100644
index 780f3fe8e5..0000000000
--- a/android/res/drawable/bg_bottom_btn_active.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <corners android:radius="3dp" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/text_place_page_buttons" />
-    <solid android:color="@android:color/transparent" />
-
-</shape>
\ No newline at end of file
diff --git a/android/res/drawable/bg_bottom_btn_selector.xml b/android/res/drawable/bg_bottom_btn_selector.xml
deleted file mode 100644
index 3f98a2b91c..0000000000
--- a/android/res/drawable/bg_bottom_btn_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- FIXME -->
-  <item android:drawable="@drawable/bg_bottom_btn_active" android:state_pressed="true"/>
-  <item android:drawable="@drawable/bg_bottom_btn"/>
-
-</selector>
\ No newline at end of file
diff --git a/android/res/drawable/bg_toolbar_button_vert.xml b/android/res/drawable/bg_toolbar_button_vert.xml
deleted file mode 100644
index b9ee59db52..0000000000
--- a/android/res/drawable/bg_toolbar_button_vert.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="200"
-          tools:ignore="UnusedAttribute">
-
-  <item android:state_pressed="true">
-    <bitmap android:gravity="center"
-            android:src="@drawable/ic_toolbar_active_vert"/>
-  </item>
-  <item android:drawable="@android:color/transparent"/>
-
-</selector>
\ No newline at end of file
diff --git a/android/res/drawable/ic_bookmarks_selector.xml b/android/res/drawable/ic_bookmarks_selector.xml
deleted file mode 100644
index acf64bc4e5..0000000000
--- a/android/res/drawable/ic_bookmarks_selector.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_checked="true">
-    <bitmap android:gravity="center"
-            android:src="@drawable/ic_place_page_bookmark_button_selected"/>
-  </item>
-  <item android:state_checked="false">
-    <bitmap android:gravity="center"
-            android:src="@drawable/ic_place_page_bookmark_button"/>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/android/res/drawable/menu_point_to_point.xml b/android/res/drawable/menu_point_to_point.xml
deleted file mode 100644
index b36b01ee6a..0000000000
--- a/android/res/drawable/menu_point_to_point.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/menu_point_to_point_disabled"
-        android:state_enabled="false"/>
-
-  <item android:drawable="@drawable/ic_menu_point_to_point"/>
-</selector>
\ No newline at end of file
diff --git a/android/res/drawable/menu_point_to_point_disabled.xml b/android/res/drawable/menu_point_to_point_disabled.xml
deleted file mode 100644
index b56d2f365e..0000000000
--- a/android/res/drawable/menu_point_to_point_disabled.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/ic_menu_point_to_point"
-        android:alpha="0.2"/>
\ No newline at end of file
diff --git a/android/res/drawable/ripple_blue.xml b/android/res/drawable/ripple_blue.xml
deleted file mode 100644
index 7c927572e8..0000000000
--- a/android/res/drawable/ripple_blue.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@color/base_blue" android:state_pressed="true"/>
-  <item android:drawable="@color/base_blue" android:state_focused="true"/>
-  <item android:drawable="@color/base_blue_light"/>
-
-</selector>
\ No newline at end of file
diff --git a/android/res/drawable/toolbar_gradient.png b/android/res/drawable/toolbar_gradient.png
deleted file mode 100644
index 47b7b4ed24..0000000000
Binary files a/android/res/drawable/toolbar_gradient.png and /dev/null differ
diff --git a/android/res/layout/layout_routing_setup.xml b/android/res/layout/layout_routing_setup.xml
deleted file mode 100644
index af395752f3..0000000000
--- a/android/res/layout/layout_routing_setup.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    android:id="@+id/layout__routing_setup"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:wheel="http://schemas.android.com/apk/res-auto"
-    style="@style/MwmWidget.Floating.Panel"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipToPadding="false"
-    android:elevation="@dimen/appbar_elevation">
-
-  <LinearLayout
-      android:id="@+id/content"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/height_routing_info"
-      android:gravity="center_vertical"
-      android:orientation="horizontal">
-
-    <com.mapswithme.maps.widget.WheelProgressView
-        android:id="@+id/wp__routing_progress"
-        android:layout_width="@dimen/base_block_size"
-        android:layout_height="@dimen/base_block_size"
-        android:layout_margin="@dimen/margin_quarter"
-        android:layout_weight="0"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="@dimen/margin_quarter"
-        android:visibility="gone"
-        wheel:centerDrawable="@drawable/ic_close"
-        wheel:wheelProgressColor="@color/routing_blue"
-        wheel:wheelSecondaryColor="@color/base_black_divider"
-        wheel:wheelThickness="@dimen/margin_eighth"/>
-
-    <ImageView
-        android:id="@+id/iv__routing_close"
-        android:layout_width="@dimen/base_block_size"
-        android:layout_height="@dimen/base_block_size"
-        android:layout_margin="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:padding="@dimen/margin_base"
-        android:scaleType="center"
-        android:src="@drawable/ic_close_routing"/>
-
-    <TextView
-        android:id="@+id/tv__planning_route"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:lines="1"
-        android:text="@string/routing_planning"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:text="Planning route..."
-        tools:visibility="gone"/>
-
-    <TextView
-        android:id="@+id/tv__routing_distance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_marginRight="@dimen/margin_base"
-        android:layout_weight="0"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:visibility="gone"
-        tools:text="38 km"
-        tools:visibility="visible"/>
-
-    <TextView
-        android:id="@+id/tv__routing_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_base"
-        android:layout_marginRight="@dimen/margin_base"
-        android:layout_weight="1"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:visibility="gone"
-        tools:text="16 min"
-        tools:visibility="visible"/>
-
-    <RadioGroup
-        android:id="@+id/rg__router"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:orientation="horizontal">
-
-      <RadioButton
-          android:id="@+id/rb__pedestrian"
-          android:layout_width="@dimen/base_block_size"
-          android:layout_height="match_parent"
-          android:button="@drawable/selector_pedestrian"/>
-
-      <RadioButton
-          android:id="@+id/rb__vehicle"
-          android:layout_width="@dimen/base_block_size"
-          android:layout_height="match_parent"
-          android:button="@drawable/selector_vehicle"/>
-    </RadioGroup>
-
-  </LinearLayout>
-
-  <Button
-      android:id="@+id/btn__start_routing"
-      style="@style/MwmWidget.Button.Blue"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/base_block_size"
-      android:layout_below="@id/content"
-      android:gravity="center"
-      android:text="@string/routing_start"
-      android:textAllCaps="true"
-      android:textAppearance="@style/MwmTextAppearance.Body3.Light"/>
-
-</RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/widget/RoutingLayout.java b/android/src/com/mapswithme/maps/widget/RoutingLayout.java
deleted file mode 100644
index 69aa0f1883..0000000000
--- a/android/src/com/mapswithme/maps/widget/RoutingLayout.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package com.mapswithme.maps.widget;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.location.Location;
-import android.os.Build;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.AbsoluteSizeSpan;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.mapswithme.maps.Framework;
-import com.mapswithme.maps.LocationState;
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
-import com.mapswithme.maps.bookmarks.data.MapObject;
-import com.mapswithme.maps.location.LocationHelper;
-import com.mapswithme.maps.routing.RoutingInfo;
-import com.mapswithme.maps.routing.RoutingResultCodesProcessor;
-import com.mapswithme.util.Config;
-import com.mapswithme.util.UiUtils;
-import com.mapswithme.util.statistics.AlohaHelper;
-
-import java.util.Calendar;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Layout for routing setup & turn instruction box.
- */
-public class RoutingLayout extends RelativeLayout implements View.OnClickListener
-{
-  private WheelProgressView mWvProgress;
-  private TextView mTvPlanning;
-  private View mIvCancelRouteBuild;
-  private TextView mTvPrepareTime;
-  private TextView mTvTotalDistance;
-  private TextView mTvTotalTime;
-  private ImageView mIvTurn;
-  private TextView mTvExitNum;
-  private View mNextTurn;
-  private ImageView mIvNextTurn;
-  private TextView mTvTurnDistance;
-  private TextView mTvPrepareDistance;
-  private MapObject mEndPoint;
-  private View mLayoutSetupRouting;
-  private View mLayoutTurnInstructions;
-  private View mBtnStart;
-  private FlatProgressView mFpRouteProgress;
-  private RadioGroup mRgRouterType;
-  private TextView mTvNextStreet;
-  private TextView mTvArrivalTime;
-
-  private double mNorth;
-  private RoutingInfo mCachedRoutingInfo;
-
-  public enum State
-  {
-    HIDDEN,
-    PREPARING,
-    ROUTE_BUILT,
-    ROUTE_BUILD_ERROR,
-    TURN_INSTRUCTIONS
-  }
-
-  private State mState = State.HIDDEN;
-
-  public interface ActionListener
-  {
-    void onCloseRouting();
-
-    void onStartRouteFollow();
-
-    void onRouteTypeChange(int type);
-  }
-
-  private ActionListener mListener;
-
-  public RoutingLayout(Context context)
-  {
-    this(context, null, 0);
-  }
-
-  public RoutingLayout(Context context, AttributeSet attrs)
-  {
-    this(context, attrs, 0);
-  }
-
-  public RoutingLayout(Context context, AttributeSet attrs, int defStyleAttr)
-  {
-    super(context, attrs, defStyleAttr);
-    inflate(getContext(), R.layout.layout_routing_full, this);
-    setClipToPadding(false);
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-      setElevation(UiUtils.dimen(R.dimen.appbar_elevation));
-
-    if (isInEditMode())
-      return;
-
-    initViews();
-    UiUtils.hide(this, mLayoutSetupRouting, mBtnStart, mLayoutTurnInstructions);
-  }
-
-  public void setListener(ActionListener listener)
-  {
-    mListener = listener;
-  }
-
-  public void refreshAzimuth(double north)
-  {
-    mNorth = north;
-    if (mState == State.TURN_INSTRUCTIONS)
-      refreshTurnInstructions();
-  }
-
-  private void initViews()
-  {
-    mLayoutSetupRouting = findViewById(R.id.layout__routing_setup);
-    mWvProgress = (WheelProgressView) mLayoutSetupRouting.findViewById(R.id.wp__routing_progress);
-    mWvProgress.setOnClickListener(this);
-    mTvPlanning = (TextView) mLayoutSetupRouting.findViewById(R.id.tv__planning_route);
-    mRgRouterType = (RadioGroup) mLayoutSetupRouting.findViewById(R.id.rg__router);
-    mRgRouterType.findViewById(R.id.rb__vehicle).setOnClickListener(this);
-    mRgRouterType.findViewById(R.id.rb__pedestrian).setOnClickListener(this);
-    mIvCancelRouteBuild = mLayoutSetupRouting.findViewById(R.id.iv__routing_close);
-    mIvCancelRouteBuild.setOnClickListener(this);
-    mTvPrepareDistance = (TextView) mLayoutSetupRouting.findViewById(R.id.tv__routing_distance);
-    mTvPrepareTime = (TextView) mLayoutSetupRouting.findViewById(R.id.tv__routing_time);
-    mBtnStart = mLayoutSetupRouting.findViewById(R.id.btn__start_routing);
-    mBtnStart.setOnClickListener(this);
-
-    mLayoutTurnInstructions = findViewById(R.id.layout__turn_instructions);
-    mTvTotalDistance = (TextView) mLayoutTurnInstructions.findViewById(R.id.tv__total_distance);
-    mTvTotalTime = (TextView) mLayoutTurnInstructions.findViewById(R.id.tv__total_time);
-    mTvArrivalTime = (TextView) mLayoutTurnInstructions.findViewById(R.id.tv__arrival_time);
-    mIvTurn = (ImageView) mLayoutTurnInstructions.findViewById(R.id.iv__turn);
-    mTvExitNum = (TextView) mLayoutTurnInstructions.findViewById(R.id.tv__exit_num);
-    mNextTurn = findViewById(R.id.next_turn);
-    mIvNextTurn = (ImageView) mNextTurn.findViewById(R.id.iv__next_turn);
-    mTvTurnDistance = (TextView) mLayoutTurnInstructions.findViewById(R.id.tv__turn_distance);
-    mLayoutTurnInstructions.findViewById(R.id.btn__close).setOnClickListener(this);
-    mFpRouteProgress = (FlatProgressView) mLayoutTurnInstructions.findViewById(R.id.fp__route_progress);
-    mTvNextStreet = (TextView) mLayoutTurnInstructions.findViewById(R.id.tv__next_street);
-  }
-
-  @Override
-  public void onClick(View v)
-  {
-    switch (v.getId())
-    {
-    case R.id.btn__close:
-      AlohaHelper.logClick(AlohaHelper.ROUTING_CLOSE);
-      setState(State.HIDDEN, true);
-      mListener.onCloseRouting();
-      break;
-    case R.id.iv__routing_close:
-      AlohaHelper.logClick(AlohaHelper.ROUTING_GO_CLOSE);
-      setState(State.HIDDEN, true);
-      mListener.onCloseRouting();
-      break;
-    case R.id.wp__routing_progress:
-      AlohaHelper.logClick(AlohaHelper.ROUTING_PROGRESS_CLOSE);
-      setState(State.HIDDEN, true);
-      mListener.onCloseRouting();
-      break;
-    case R.id.btn__start_routing:
-      AlohaHelper.logClick(AlohaHelper.ROUTING_GO);
-      setState(State.TURN_INSTRUCTIONS, true);
-      Framework.nativeFollowRoute();
-      mListener.onStartRouteFollow();
-      break;
-    case R.id.rb__pedestrian:
-      AlohaHelper.logClick(AlohaHelper.ROUTING_PEDESTRIAN_SET);
-      Framework.setRouter(Framework.ROUTER_TYPE_PEDESTRIAN);
-      mListener.onRouteTypeChange(Framework.ROUTER_TYPE_PEDESTRIAN);
-      setState(State.PREPARING, true);
-      break;
-    case R.id.rb__vehicle:
-      AlohaHelper.logClick(AlohaHelper.ROUTING_VEHICLE_SET);
-      Framework.setRouter(Framework.ROUTER_TYPE_VEHICLE);
-      mListener.onRouteTypeChange(Framework.ROUTER_TYPE_VEHICLE);
-      setState(State.PREPARING, true);
-      break;
-    }
-  }
-
-  public void setState(State state, boolean animated)
-  {
-    mState = state;
-    switch (mState)
-    {
-    case HIDDEN:
-      if (animated)
-        UiUtils.disappearSlidingUp(this, null);
-      else
-        UiUtils.hide(this);
-      UiUtils.hide(mBtnStart, mTvExitNum);
-      Framework.nativeCloseRouting();
-      mEndPoint = null;
-      break;
-    case PREPARING:
-      if (mEndPoint == null)
-        throw new IllegalStateException("End point should be not null to prepare routing");
-
-      Framework.nativeCloseRouting();
-      UiUtils.show(mLayoutSetupRouting, mWvProgress, mTvPlanning);
-      UiUtils.hide(mLayoutTurnInstructions, mTvPrepareDistance, mTvPrepareTime, mIvCancelRouteBuild, mNextTurn);
-      mTvPlanning.setText(R.string.routing_planning);
-      mWvProgress.setProgress(0);
-      if (animated)
-      {
-        UiUtils.appearSlidingDown(this, null);
-        UiUtils.disappearSlidingUp(mBtnStart, null);
-      }
-      else
-      {
-        UiUtils.show(this);
-        UiUtils.hide(mBtnStart);
-      }
-      buildRoute();
-      break;
-    case ROUTE_BUILT:
-      UiUtils.show(this, mLayoutSetupRouting, mTvPrepareDistance, mTvPrepareTime, mIvCancelRouteBuild);
-      UiUtils.hide(mLayoutTurnInstructions, mWvProgress, mTvPlanning, mNextTurn);
-      if (animated)
-        UiUtils.appearSlidingDown(mBtnStart, null);
-      else
-        UiUtils.show(mBtnStart);
-      refreshRouteSetup();
-      break;
-    case ROUTE_BUILD_ERROR:
-      UiUtils.show(mLayoutSetupRouting, mIvCancelRouteBuild, mTvPlanning);
-      UiUtils.hide(mLayoutTurnInstructions, mTvPrepareDistance, mTvPrepareTime, mWvProgress, mNextTurn);
-      mTvPlanning.setText(R.string.routing_planning_error);
-      break;
-    case TURN_INSTRUCTIONS:
-      UiUtils.show(this, mLayoutTurnInstructions);
-      UiUtils.disappearSlidingUp(mLayoutSetupRouting, null);
-      refreshTurnInstructions();
-      break;
-    }
-  }
-
-  public State getState()
-  {
-    return mState;
-  }
-
-  public void setEndPoint(MapObject mapObject)
-  {
-    mEndPoint = mapObject;
-    checkBestRouter();
-  }
-
-  public MapObject getEndPoint()
-  {
-    return mEndPoint;
-  }
-
-  public void updateRouteInfo()
-  {
-    mCachedRoutingInfo = Framework.nativeGetRouteFollowingInfo();
-    if (mState == State.TURN_INSTRUCTIONS)
-      refreshTurnInstructions();
-  }
-
-  public void setRouteBuildingProgress(float progress)
-  {
-    mWvProgress.setProgress((int) progress);
-  }
-
-  private void refreshTurnInstructions()
-  {
-    if (mCachedRoutingInfo == null)
-      return;
-
-    if (Framework.getRouter() == Framework.ROUTER_TYPE_VEHICLE)
-      refreshVehicleInfo(mCachedRoutingInfo);
-    else
-      refreshPedestrianAzimutAndDistance(mCachedRoutingInfo);
-
-    mTvTotalTime.setText(formatRoutingTime(mCachedRoutingInfo.totalTimeInSeconds));
-    mTvTotalDistance.setText(buildSpannedText(UiUtils.dimen(R.dimen.text_size_routing_number), UiUtils.dimen(R.dimen.text_size_routing_dimension),
-                                              mCachedRoutingInfo.distToTarget, mCachedRoutingInfo.targetUnits));
-    mTvArrivalTime.setText(formatArrivalTime(mCachedRoutingInfo.totalTimeInSeconds));
-    UiUtils.setTextAndHideIfEmpty(mTvNextStreet, mCachedRoutingInfo.nextStreet);
-    mFpRouteProgress.setProgress((int) mCachedRoutingInfo.completionPercent);
-  }
-
-  private void refreshVehicleInfo(RoutingInfo routingInfo)
-  {
-    mTvTurnDistance.setText(buildSpannedText(UiUtils.dimen(R.dimen.text_size_display_1), UiUtils.dimen(R.dimen.text_size_toolbar),
-                                             routingInfo.distToTurn, routingInfo.turnUnits));
-    routingInfo.vehicleTurnDirection.setTurnDrawable(mIvTurn);
-    if (RoutingInfo.VehicleTurnDirection.isRoundAbout(routingInfo.vehicleTurnDirection))
-      UiUtils.setTextAndShow(mTvExitNum, String.valueOf(routingInfo.exitNum));
-    else
-      UiUtils.hide(mTvExitNum);
-
-    if (routingInfo.vehicleNextTurnDirection.containsNextTurn())
-    {
-      if (mNextTurn.getVisibility() != VISIBLE && mNextTurn.getAnimation() == null)
-        UiUtils.appearSlidingDown(mNextTurn, null);
-
-      routingInfo.vehicleNextTurnDirection.setNextTurnDrawable(mIvNextTurn);
-    }
-    else if (mNextTurn.getVisibility() == VISIBLE && mNextTurn.getAnimation() == null)
-      UiUtils.disappearSlidingUp(mNextTurn, null);
-  }
-
-  private void refreshPedestrianAzimutAndDistance(RoutingInfo info)
-  {
-    Location location = LocationHelper.INSTANCE.getLastLocation();
-    DistanceAndAzimut distanceAndAzimut = Framework.nativeGetDistanceAndAzimutFromLatLon(
-        info.pedestrianNextDirection.getLatitude(), info.pedestrianNextDirection.getLongitude(), location.getLatitude(), location.getLongitude(), mNorth);
-
-    String[] splitDistance = distanceAndAzimut.getDistance().split(" ");
-    mTvTurnDistance.setText(buildSpannedText(UiUtils.dimen(R.dimen.text_size_display_1), UiUtils.dimen(R.dimen.text_size_toolbar),
-                                             splitDistance[0], splitDistance[1]));
-
-    if (info.pedestrianTurnDirection != null)
-      info.pedestrianTurnDirection.setTurnDrawable(mIvTurn, distanceAndAzimut);
-  }
-
-  private void refreshRouteSetup()
-  {
-    mCachedRoutingInfo = Framework.nativeGetRouteFollowingInfo();
-    if (mCachedRoutingInfo == null)
-      return;
-
-    mTvPrepareDistance.setText(buildSpannedText(UiUtils.dimen(R.dimen.text_size_routing_number), UiUtils.dimen(R.dimen.text_size_routing_dimension),
-                                                mCachedRoutingInfo.distToTarget, mCachedRoutingInfo.targetUnits));
-    mTvPrepareTime.setText(formatRoutingTime(mCachedRoutingInfo.totalTimeInSeconds));
-  }
-
-  private static SpannableStringBuilder buildSpannedText(int mainTextSize, int unitsTextSize, String main, String units)
-  {
-    SpannableStringBuilder builder = new SpannableStringBuilder(main).append(" ").append(units);
-    builder.setSpan(new AbsoluteSizeSpan(mainTextSize, false), 0, main.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    builder.setSpan(new AbsoluteSizeSpan(unitsTextSize, false), main.length(), builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-    return builder;
-  }
-
-  private static CharSequence formatRoutingTime(int seconds)
-  {
-    long minutes = TimeUnit.SECONDS.toMinutes(seconds) % 60;
-    long hours = TimeUnit.SECONDS.toHours(seconds);
-    if (hours == 0 && minutes == 0)
-      // one minute is added to estimated time to destination point to prevent displaying zero minutes left
-      minutes++;
-
-    return hours == 0 ?
-           buildSpannedText(UiUtils.dimen(R.dimen.text_size_routing_number), UiUtils.dimen(R.dimen.text_size_routing_dimension), String.valueOf(minutes), "min") :
-           TextUtils.concat(buildSpannedText(UiUtils.dimen(R.dimen.text_size_routing_number), UiUtils.dimen(R.dimen.text_size_routing_dimension),
-                                             String.valueOf(hours), "h "),
-                            buildSpannedText(UiUtils.dimen(R.dimen.text_size_routing_number), UiUtils.dimen(R.dimen.text_size_routing_dimension),
-                                             String.valueOf(minutes), "min"));
-  }
-
-  private static String formatArrivalTime(int seconds)
-  {
-    Calendar current = Calendar.getInstance();
-    current.add(Calendar.SECOND, seconds);
-    return String.format("%d:%02d", current.get(Calendar.HOUR_OF_DAY), current.get(Calendar.MINUTE));
-  }
-
-  private void buildRoute()
-  {
-    if (!Config.isRoutingDisclaimerAccepted())
-    {
-      showRoutingDisclaimer();
-      return;
-    }
-
-    if (!LocationState.isTurnedOn())
-    {
-      onMissingLocation();
-      return;
-    }
-
-    Location location = LocationHelper.INSTANCE.getLastLocation();
-    if (location == null)
-    {
-      // TODO remove that hack after proper route reconstruction logic will be finished
-      setState(State.HIDDEN, false);
-      return;
-    }
-    Framework.nativeBuildRoute(location.getLatitude(), location.getLongitude(), mEndPoint.getLat(), mEndPoint.getLon());
-  }
-
-  private void checkBestRouter()
-  {
-    final Location location = LocationHelper.INSTANCE.getLastLocation();
-    if (location == null || mEndPoint == null)
-      return;
-
-    final int bestRouter = Framework.nativeGetBestRouter(location.getLatitude(), location.getLongitude(), mEndPoint.getLat(), mEndPoint.getLon());
-    mRgRouterType.check(bestRouter == Framework.ROUTER_TYPE_PEDESTRIAN ? R.id.rb__pedestrian : R.id.rb__vehicle);
-    Framework.setRouter(bestRouter);
-  }
-
-  private void showRoutingDisclaimer()
-  {
-    StringBuilder builder = new StringBuilder();
-    for (int resId : new int[]{R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision,
-        R.string.dialog_routing_disclaimer_recommendations, R.string.dialog_routing_disclaimer_beware})
-      builder.append(getContext().getString(resId)).append("\n\n");
-
-    new AlertDialog.Builder(getContext())
-        .setTitle(R.string.dialog_routing_disclaimer_title)
-        .setMessage(builder.toString())
-        .setCancelable(false)
-        .setPositiveButton(getContext().getString(R.string.ok), new DialogInterface.OnClickListener()
-        {
-          @Override
-          public void onClick(DialogInterface dlg, int which)
-          {
-            Config.acceptRoutingDisclaimer();
-            dlg.dismiss();
-            buildRoute();
-          }
-        })
-        .setNegativeButton(getContext().getString(R.string.cancel), null)
-        .show();
-  }
-
-  private void onMissingLocation()
-  {
-    Context context = getContext();
-    if (context instanceof Framework.RoutingListener)
-      ((Framework.RoutingListener) context).onRoutingEvent(RoutingResultCodesProcessor.NO_POSITION, null, null);
-  }
-
-  @Override
-  protected Parcelable onSaveInstanceState()
-  {
-    Parcelable parentState = super.onSaveInstanceState();
-    SavedState savedState = new SavedState(parentState);
-    savedState.object = getEndPoint();
-    savedState.routingStateOrdinal = mState.ordinal();
-    return savedState;
-  }
-
-  @Override
-  protected void onRestoreInstanceState(Parcelable state)
-  {
-    SavedState savedState = (SavedState) state;
-    super.onRestoreInstanceState(savedState.getSuperState());
-    setEndPoint(savedState.object);
-
-    // if route was build but it was lost before state was restored - we should rebuild again from scratch
-    int correctOrdinal;
-    if (savedState.routingStateOrdinal > State.PREPARING.ordinal() && !Framework.nativeIsRouteBuilt())
-      correctOrdinal = State.PREPARING.ordinal();
-    else
-      correctOrdinal = savedState.routingStateOrdinal;
-
-    setState(State.values()[correctOrdinal], false);
-  }
-
-  static class SavedState extends BaseSavedState
-  {
-    int routingStateOrdinal;
-    MapObject object;
-
-    public SavedState(Parcel source)
-    {
-      super(source);
-      routingStateOrdinal = source.readInt();
-      object = source.readParcelable(MapObject.class.getClassLoader());
-    }
-
-    public SavedState(Parcelable superState)
-    {
-      super(superState);
-    }
-
-    @Override
-    public void writeToParcel(@NonNull Parcel dest, int flags)
-    {
-      super.writeToParcel(dest, flags);
-      dest.writeInt(routingStateOrdinal);
-      dest.writeParcelable(object, 0);
-    }
-
-    public static final Creator<SavedState> CREATOR = new Creator<SavedState>()
-    {
-      @Override
-      public SavedState createFromParcel(Parcel source)
-      {
-        return new SavedState(source);
-      }
-
-      @Override
-      public SavedState[] newArray(int size)
-      {
-        return new SavedState[0];
-      }
-    };
-  }
-}