diff --git a/OsmAnd/res/layout/route_option_btn.xml b/OsmAnd/res/layout/route_option_btn.xml
index b6adea5f6b..8c5c6b8915 100644
--- a/OsmAnd/res/layout/route_option_btn.xml
+++ b/OsmAnd/res/layout/route_option_btn.xml
@@ -38,10 +38,10 @@
 			android:letterSpacing="@dimen/text_button_letter_spacing"
 			android:maxLines="1"
 			android:paddingBottom="3dp"
-			android:paddingEnd="16dp"
-			android:paddingLeft="3dp"
-			android:paddingRight="16dp"
-			android:paddingStart="3dp"
+			android:layout_marginLeft="3dp"
+			android:layout_marginStart="3dp"
+			android:layout_marginRight="16dp"
+			android:layout_marginEnd="16dp"
 			android:paddingTop="3dp"
 			android:text="@string/routing_attr_avoid_motorway_name"
 			android:textSize="@dimen/default_sub_text_size"
diff --git a/OsmAnd/res/layout/route_options_container.xml b/OsmAnd/res/layout/route_options_container.xml
index 4a56f12f52..9bbbff95cc 100644
--- a/OsmAnd/res/layout/route_options_container.xml
+++ b/OsmAnd/res/layout/route_options_container.xml
@@ -56,15 +56,15 @@
 		android:layout_gravity="end|center_vertical"
 		android:layout_marginLeft="1dp"
 		android:layout_marginRight="1dp"
-		android:paddingLeft="@dimen/route_info_icon_vertical_padding"
 		android:paddingTop="3dp"
+		android:paddingLeft="@dimen/route_info_icon_vertical_padding"
 		android:paddingRight="@dimen/route_info_icon_vertical_padding"
+		android:paddingStart="@dimen/route_info_icon_vertical_padding"
+		android:paddingEnd="@dimen/route_info_icon_vertical_padding"
 		android:paddingBottom="3dp"
 		android:contentDescription="@string/shared_string_remove"
 		tools:src="@drawable/ic_action_remove_dark"
 		android:layout_marginEnd="1dp"
-		android:paddingStart="@dimen/route_info_icon_vertical_padding"
-		android:paddingEnd="@dimen/route_info_icon_vertical_padding"
 		android:layout_marginStart="1dp" />
 
 	<View
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
index 9da21f26e8..e6ad1b1728 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
@@ -1392,7 +1392,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 			});
 			if (item != null) {
 				LinearLayout.LayoutParams layoutParams = getContainerButtonLayoutParams(mapActivity, false);
-				layoutParams.setMargins(margin, 0, margin, 0);
+				AndroidUtils.setMargins(layoutParams, margin, 0, margin, 0);
 				optionsContainer.addView(item, layoutParams);
 			}
 		}
@@ -1402,7 +1402,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 		if (containerParams) {
 			int margin = AndroidUtils.dpToPx(context, 3);
 			LinearLayout.LayoutParams containerBtnLp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
-			containerBtnLp.setMargins(margin, 0, margin, 0);
+			AndroidUtils.setMargins(containerBtnLp, margin, 0, margin, 0);
 			return containerBtnLp;
 		} else {
 			return new LinearLayout.LayoutParams(AndroidUtils.dpToPx(context, 100), ViewGroup.LayoutParams.MATCH_PARENT);