diff --git a/android/res/layout-w840dp/activity_map.xml b/android/res/layout-w840dp/activity_map.xml
index 45ee4f74d0..1e11413a6d 100644
--- a/android/res/layout-w840dp/activity_map.xml
+++ b/android/res/layout-w840dp/activity_map.xml
@@ -35,7 +35,7 @@
         android:id="@+id/layout__routing"
         android:layout_width="@dimen/panel_width"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_base"/>
+        android:paddingBottom="@dimen/margin_base"/>
 
     <com.mapswithme.maps.widget.placepage.PlacePageView
         android:id="@+id/info_box"
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
index 69e089d05b..5f6aead188 100644
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@@ -21,7 +21,8 @@
       android:id="@+id/layout__routing"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_below="@id/toolbar"/>
+      android:layout_below="@id/toolbar"
+      android:paddingBottom="@dimen/margin_base"/>
 
   <include
       android:id="@+id/navigation_buttons"
diff --git a/android/res/layout/layout_routing_full.xml b/android/res/layout/layout_routing_full.xml
index e7b8afb14c..1d1a6c801d 100644
--- a/android/res/layout/layout_routing_full.xml
+++ b/android/res/layout/layout_routing_full.xml
@@ -5,13 +5,13 @@
 
   <include
       android:id="@+id/layout__routing_setup"
-      layout="@layout/layout_routing_setup"
-      tools:visibility="gone"/>
+      layout="@layout/layout_routing_setup"/>
 
   <include
       android:id="@+id/layout__turn_instructions"
       layout="@layout/layout_turn_instructions"
-      android:visibility="gone"/>
+      android:visibility="gone"
+      tools:visibility="visible"/>
 
   <LinearLayout
       android:id="@+id/next_turn"
@@ -27,7 +27,8 @@
       android:paddingLeft="@dimen/margin_base"
       android:paddingRight="@dimen/margin_base"
       android:paddingTop="@dimen/margin_quarter"
-      android:visibility="gone">
+      android:visibility="gone"
+      tools:visibility="visible">
 
     <TextView
         android:id="@+id/tv__next_turn"
diff --git a/android/res/layout/layout_routing_setup.xml b/android/res/layout/layout_routing_setup.xml
index b1dc0928a7..af395752f3 100644
--- a/android/res/layout/layout_routing_setup.xml
+++ b/android/res/layout/layout_routing_setup.xml
@@ -4,10 +4,11 @@
     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"
-    android:background="@color/bg_top_panels"
+    style="@style/MwmWidget.Floating.Panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clipToPadding="false">
+    android:clipToPadding="false"
+    android:elevation="@dimen/appbar_elevation">
 
   <LinearLayout
       android:id="@+id/content"
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index b11d611d55..16d969801b 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -112,8 +112,7 @@
 
   <style name="MwmWidget.Floating"/>
 
-  <style name="MwmWidget.Floating.Panel"
-         parent="MwmWidget.Floating">
+  <style name="MwmWidget.Floating.Panel">
     <item name="android:background">@color/bg_top_panels</item>
   </style>
 
@@ -338,4 +337,4 @@
 
   <!-- Text appearance -->
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/src/com/mapswithme/maps/widget/RoutingLayout.java b/android/src/com/mapswithme/maps/widget/RoutingLayout.java
index eeb463ad06..bb2074338a 100644
--- a/android/src/com/mapswithme/maps/widget/RoutingLayout.java
+++ b/android/src/com/mapswithme/maps/widget/RoutingLayout.java
@@ -101,7 +101,7 @@ public class RoutingLayout extends RelativeLayout implements View.OnClickListene
     super(context, attrs, defStyleAttr);
     inflate(getContext(), R.layout.layout_routing_full, this);
     setClipToPadding(false);
-    setPadding(0, 0, 0, UiUtils.dimen(R.dimen.margin_quarter));
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
       setElevation(UiUtils.dimen(R.dimen.appbar_elevation));