diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index de9c7c095e..876b9c30f3 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -2882,8 +2882,8 @@ public class OsmandSettings {
 
 	public enum MetricsConstants {
 		KILOMETERS_AND_METERS(R.string.si_km_m, "km-m"),
-		MILES_AND_METERS(R.string.si_mi_meters, "mi-m"),
 		MILES_AND_FOOTS(R.string.si_mi_foots, "mi-f"),
+		MILES_AND_METERS(R.string.si_mi_meters, "mi-m"),
 		NAUTICAL_MILES(R.string.si_nm, "nm"),
 		MILES_AND_YARDS(R.string.si_mi_yard, "mi-y");
 
@@ -2929,7 +2929,7 @@ public class OsmandSettings {
 	public enum DrivingRegion {
 
 		EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false, false),
-		US(R.string.driving_region_us, MetricsConstants.MILES_AND_METERS, false, true),
+		US(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true),
 		CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false, true),
 		UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_METERS, true, false),
 		JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true, false);
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 1a416a12ca..0ff0fbca64 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -165,7 +165,7 @@ public class DownloadIndexesThread {
 		boolean americanSigns = "american".equals(params.getRegionRoadSigns());
 		boolean leftHand = "yes".equals(params.getRegionLeftHandDriving());
 		MetricsConstants mc = "miles".equals(params.getRegionMetric()) ?
-				MetricsConstants.MILES_AND_METERS : MetricsConstants.KILOMETERS_AND_METERS;
+				MetricsConstants.MILES_AND_FOOTS : MetricsConstants.KILOMETERS_AND_METERS;
 		for (DrivingRegion r : DrivingRegion.values()) {
 			if (r.americanSigns == americanSigns && r.leftHandDriving == leftHand &&
 					r.defMetrics == mc) {