diff --git a/OsmAnd/res/layout/import_track_card.xml b/OsmAnd/res/layout/import_track_card.xml
index 50cb493196..3f3ccf7d64 100644
--- a/OsmAnd/res/layout/import_track_card.xml
+++ b/OsmAnd/res/layout/import_track_card.xml
@@ -18,6 +18,7 @@
 		android:paddingRight="@dimen/content_padding"
 		android:text="@string/import_track_descr"
 		android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+		android:textColor="?android:textColorSecondary"
 		osmand:typeface="@string/font_roboto_regular" />
 
 	<include layout="@layout/bottom_sheet_item_simple" />
diff --git a/OsmAnd/res/layout/navigate_track_options_card.xml b/OsmAnd/res/layout/navigate_track_options_card.xml
index a89c2d810d..b3198d89ba 100644
--- a/OsmAnd/res/layout/navigate_track_options_card.xml
+++ b/OsmAnd/res/layout/navigate_track_options_card.xml
@@ -11,16 +11,16 @@
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
+		android:orientation="vertical">
 
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:letterSpacing="@dimen/description_letter_spacing"
+			android:paddingLeft="@dimen/content_padding"
 			android:paddingTop="@dimen/list_header_settings_top_margin"
+			android:paddingRight="@dimen/content_padding"
 			android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
 			android:singleLine="true"
 			android:text="@string/navigate_to_track_descr"
diff --git a/OsmAnd/res/layout/radio_buttons_with_descr.xml b/OsmAnd/res/layout/radio_buttons_with_descr.xml
index a32900472f..6301e65ecd 100644
--- a/OsmAnd/res/layout/radio_buttons_with_descr.xml
+++ b/OsmAnd/res/layout/radio_buttons_with_descr.xml
@@ -12,6 +12,8 @@
 		android:layout_height="wrap_content"
 		android:gravity="center_vertical"
 		android:minHeight="@dimen/setting_list_item_small_height"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
 		android:textAppearance="@style/TextAppearance.ListItemTitle"
 		osmand:typeface="@string/font_roboto_regular"
 		tools:text="@string/pass_whole_track_descr" />
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java
index d8b74777b3..c31e08460e 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java
@@ -40,10 +40,10 @@ import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.helpers.ImportHelper;
 import net.osmand.plus.helpers.ImportHelper.OnGpxImportCompleteListener;
-import net.osmand.plus.measurementtool.MeasurementEditingContext;
-import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.measurementtool.GpxData;
 import net.osmand.plus.measurementtool.GpxData.ActionType;
+import net.osmand.plus.measurementtool.MeasurementEditingContext;
+import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.LocalRoutingParameter;
 import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.OtherLocalRoutingParameter;
 import net.osmand.plus.routepreparationmenu.cards.AttachTrackToRoadsCard;
@@ -195,7 +195,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
 				SelectTrackCard selectTrackCard = new SelectTrackCard(mapActivity);
 				selectTrackCard.setListener(this);
 				cardsContainer.addView(selectTrackCard.build(mapActivity));
-				cardsContainer.addView(buildDividerView(cardsContainer,false));
+				cardsContainer.addView(buildDividerView(cardsContainer, false));
 
 				ApplicationMode mode = app.getRoutingHelper().getAppMode();
 
@@ -213,7 +213,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
 					cardsContainer.addView(reverseTrackCard.build(mapActivity));
 //					}
 					if (!gpxFile.hasRtePt()) {
-						cardsContainer.addView(buildDividerView(cardsContainer,true));
+						cardsContainer.addView(buildDividerView(cardsContainer, true));
 
 						AttachTrackToRoadsCard attachTrackCard = new AttachTrackToRoadsCard(mapActivity);
 						attachTrackCard.setListener(this);
@@ -519,7 +519,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
 				dismiss();
 			}
 		});
-		UiUtilities.setupDialogButton(isNightMode(), cancelButton, DialogButtonType.SECONDARY, R.string.shared_string_cancel);
+		UiUtilities.setupDialogButton(isNightMode(), cancelButton, DialogButtonType.SECONDARY, R.string.shared_string_close);
 	}
 
 	private void setupScrollShadow() {