diff --git a/OsmAnd/res/drawable/btn_flat.xml b/OsmAnd/res/drawable/btn_flat.xml
index 01dad73153..a16f83e3ab 100644
--- a/OsmAnd/res/drawable/btn_flat.xml
+++ b/OsmAnd/res/drawable/btn_flat.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_light_pressed" />
-            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-        </shape></item>
-    <item><shape android:shape="rectangle">
-            <solid android:color="@color/map_widget_light" />
-            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-        </shape></item>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_flat_night.xml b/OsmAnd/res/drawable/btn_flat_night.xml
index 05b8c4618b..96284b337c 100644
--- a/OsmAnd/res/drawable/btn_flat_night.xml
+++ b/OsmAnd/res/drawable/btn_flat_night.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
-        </shape></item>
-    <item><shape android:shape="rectangle">
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark" />
-            <stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_flat_transparent.xml b/OsmAnd/res/drawable/btn_flat_transparent.xml
index 7b4984c71e..43c664b267 100644
--- a/OsmAnd/res/drawable/btn_flat_transparent.xml
+++ b/OsmAnd/res/drawable/btn_flat_transparent.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-        </shape></item>
-    <item><shape android:shape="rectangle">
-        	<solid android:color="@color/color_transparent" />
-            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-        </shape></item>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/color_transparent" />
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_left_round.xml b/OsmAnd/res/drawable/btn_left_round.xml
index be66a3477f..a16f83e3ab 100644
--- a/OsmAnd/res/drawable/btn_left_round.xml
+++ b/OsmAnd/res/drawable/btn_left_round.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_light_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
-    <item><shape android:shape="rectangle">
-            <solid android:color="@color/map_widget_light" />
-            <corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_left_round_night.xml b/OsmAnd/res/drawable/btn_left_round_night.xml
index c1b9641686..96284b337c 100644
--- a/OsmAnd/res/drawable/btn_left_round_night.xml
+++ b/OsmAnd/res/drawable/btn_left_round_night.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
-        </shape></item>
-    <item><shape android:shape="rectangle">
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark" />
-            <corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
-            <stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_left_round_transparent.xml b/OsmAnd/res/drawable/btn_left_round_transparent.xml
index c7b6be83ab..8cf8a8eddc 100644
--- a/OsmAnd/res/drawable/btn_left_round_transparent.xml
+++ b/OsmAnd/res/drawable/btn_left_round_transparent.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
-    <item><shape android:shape="rectangle">
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
             <solid android:color="@color/color_transparent" />
-            <corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
diff --git a/OsmAnd/res/drawable/btn_right_round.xml b/OsmAnd/res/drawable/btn_right_round.xml
index dd4ff6f2e0..a16f83e3ab 100644
--- a/OsmAnd/res/drawable/btn_right_round.xml
+++ b/OsmAnd/res/drawable/btn_right_round.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_light_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
-    <item><shape android:shape="rectangle">
-            <solid android:color="@color/map_widget_light" />
-            <corners
-                android:topRightRadius="@dimen/map_button_rect_rad"
-                android:bottomRightRadius="@dimen/map_button_rect_rad"
-                />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_right_round_night.xml b/OsmAnd/res/drawable/btn_right_round_night.xml
index f345520714..96284b337c 100644
--- a/OsmAnd/res/drawable/btn_right_round_night.xml
+++ b/OsmAnd/res/drawable/btn_right_round_night.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
-        </shape></item>
-    <item><shape android:shape="rectangle">
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark" />
-            <corners
-                android:topRightRadius="@dimen/map_button_rect_rad"
-                android:bottomRightRadius="@dimen/map_button_rect_rad" 
-                />
-            <stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_right_round_transparent.xml b/OsmAnd/res/drawable/btn_right_round_transparent.xml
index ded2f4fe06..43c664b267 100644
--- a/OsmAnd/res/drawable/btn_right_round_transparent.xml
+++ b/OsmAnd/res/drawable/btn_right_round_transparent.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
-    <item><shape android:shape="rectangle">
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
             <solid android:color="@color/color_transparent" />
-            <corners
-                android:topRightRadius="@dimen/map_button_rect_rad"
-                android:bottomRightRadius="@dimen/map_button_rect_rad" 
-                />
-            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round.xml b/OsmAnd/res/drawable/btn_round.xml
index eb1818b047..a16f83e3ab 100644
--- a/OsmAnd/res/drawable/btn_round.xml
+++ b/OsmAnd/res/drawable/btn_round.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/btn_round_p" android:state_pressed="true"/>
-    <item android:drawable="@drawable/btn_round_n"/>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_night.xml b/OsmAnd/res/drawable/btn_round_night.xml
index b22ef2a21a..96284b337c 100644
--- a/OsmAnd/res/drawable/btn_round_night.xml
+++ b/OsmAnd/res/drawable/btn_round_night.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"  android:drawable="@drawable/btn_round_night_p"/>
-    <item android:drawable="@drawable/btn_round_night_n"/>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark_pressed" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark" />
+        </shape>
+    </item>
+
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_transparent.xml b/OsmAnd/res/drawable/btn_round_transparent.xml
index d1bc6dff84..43c664b267 100644
--- a/OsmAnd/res/drawable/btn_round_transparent.xml
+++ b/OsmAnd/res/drawable/btn_round_transparent.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
             <solid android:color="@color/map_widget_dark_pressed" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-        </shape></item>
-    <item><shape android:shape="rectangle">
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
             <solid android:color="@color/color_transparent" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
-            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 4570ead926..5673389a6f 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -31,7 +31,9 @@
             android:layout_width="@dimen/map_widget_image"
             android:layout_height="@dimen/map_widget_image"
             android:layout_gravity="center"
-            android:layout_marginTop="2dp"
+            android:layout_marginStart="@dimen/map_widget_icon_margin_left"
+            android:layout_marginLeft="@dimen/map_widget_icon_margin_left"
+            android:layout_marginTop="@dimen/map_widget_icon_margin"
             android:gravity="center"
             osmand:srcCompat="@drawable/ic_action_remove_dark"
             android:visibility="gone"/>
@@ -49,7 +51,8 @@
             android:layout_width="@dimen/map_widget_icon"
             android:layout_height="@dimen/map_widget_icon"
             android:layout_gravity="start|center_vertical"
-            android:layout_marginLeft="@dimen/map_widget_icon_margin"
+            android:layout_marginStart="@dimen/map_widget_icon_margin_left"
+            android:layout_marginLeft="@dimen/map_widget_icon_margin_left"
             android:layout_marginRight="@dimen/map_widget_icon_margin"
             android:gravity="center"
             osmand:srcCompat="@drawable/ic_action_remove_dark"
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 7bb27b3f90..1f9ad39926 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -45,6 +45,7 @@
 	<dimen name="map_button_rect_rad">3dp</dimen>
 
 	<dimen name="map_widget_icon_margin">3dp</dimen>
+	<dimen name="map_widget_icon_margin_left">9dp</dimen>
 
 	<dimen name="widget_turn_lane_size">54dp</dimen>
 	<dimen name="widget_turn_lane_border">9dp</dimen>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 1b1e9bde50..7150599627 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -128,7 +128,7 @@
 	<color name="map_widget_dark_stroke">#80ffffff</color>
 	<color name="map_widget_dark_pressed">#80aaaaaa</color>
 	<color name="map_widget_light_trans">#80ffffff</color>
-	<color name="map_widget_light_pressed">#e5e5e5</color>
+	<color name="map_widget_light_pressed">#80aaaaaa</color>
 	<color name="map_widget_blue">#536dfe</color>
 	<color name="map_widget_blue_pressed">#485dd9</color>
 	<color name="map_button_icon_color_light">#727272</color>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 69f711b6fb..74f467a25f 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -153,6 +153,7 @@
 	<dimen name="map_widget_text_bottom_margin">1sp</dimen>
 	<dimen name="map_widget_text_small_bottom_margin">3sp</dimen>
 	<dimen name="map_widget_icon_margin">2dp</dimen>
+	<dimen name="map_widget_icon_margin_left">6dp</dimen>
 	<dimen name="bottom_sheet_title_big">20sp</dimen>
 
 	<dimen name="dash_margin">2dp</dimen>