diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index ca7ed77b6b..427b9defbf 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,7 @@
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
     <string name="map_widget_fluorescent">Fluorescent colors</string>
+    <string name="map_widget_show_ruler">Ruler</string>
     <string name="map_widget_appearance">Appearance</string>
     <string name="map_widget_view_direction">View direction</string>
     <string name="map_widget_transparent">Transparent views</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 95b7b5f932..d359f28cdd 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -1090,6 +1090,14 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
 		if(settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS){
 			mapView.setRotate(0);
 		}
+		int resId = R.string.rotate_map_none_opt;
+		if(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS){
+			resId = R.string.rotate_map_compass_opt;
+		} else if(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING){
+			resId = R.string.rotate_map_bearing_opt;
+		}
+		
+		AccessibleToast.makeText(this, getString(resId), Toast.LENGTH_SHORT).show();
 		mapView.refreshMap();
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/extrasettings/OsmandExtraSettings.java b/OsmAnd/src/net/osmand/plus/extrasettings/OsmandExtraSettings.java
index 9654f2e94d..f873916157 100644
--- a/OsmAnd/src/net/osmand/plus/extrasettings/OsmandExtraSettings.java
+++ b/OsmAnd/src/net/osmand/plus/extrasettings/OsmandExtraSettings.java
@@ -51,33 +51,31 @@ public class OsmandExtraSettings extends OsmandPlugin {
 	}
 	@Override
 	public void registerLayers(MapActivity activity) {
-		if (registerControls) {
-			registerControls = true;
-			final OsmandMapTileView view = activity.getMapView();
-			final MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
-			final MapInfoControls mapInfoControls = mapInfoLayer.getMapInfoControls();
-			final MapInfoControlRegInfo transparent = mapInfoControls.registerAppearanceWidget(0, R.string.map_widget_transparent,
-					"transparent", EnumSet.of(ApplicationMode.PEDESTRIAN, ApplicationMode.DEFAULT));
-			transparent.setStateChangeListener(new Runnable() {
-				@Override
-				public void run() {
-					ApplicationMode am = view.getSettings().getApplicationMode();
-					view.getSettings().TRANSPARENT_MAP_THEME.set(transparent.visible(am));
-					mapInfoLayer.recreateControls();
-				}
-			});
+		registerControls = true;
+		final OsmandMapTileView view = activity.getMapView();
+		final MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
+		final MapInfoControls mapInfoControls = mapInfoLayer.getMapInfoControls();
+		final MapInfoControlRegInfo transparent = mapInfoControls.registerAppearanceWidget(0, R.string.map_widget_transparent,
+				"transparent", EnumSet.of(ApplicationMode.PEDESTRIAN, ApplicationMode.DEFAULT));
+		transparent.setStateChangeListener(new Runnable() {
+			@Override
+			public void run() {
+				ApplicationMode am = view.getSettings().getApplicationMode();
+				view.getSettings().TRANSPARENT_MAP_THEME.set(transparent.visible(am));
+				mapInfoLayer.recreateControls();
+			}
+		});
 
-			final MapInfoControlRegInfo fluorescent = mapInfoControls.registerAppearanceWidget(0, R.string.map_widget_fluorescent,
-					"fluorescent", EnumSet.noneOf(ApplicationMode.class));
-			fluorescent.setStateChangeListener(new Runnable() {
-				@Override
-				public void run() {
-					ApplicationMode am = view.getSettings().getApplicationMode();
-					view.getSettings().FLUORESCENT_OVERLAYS.set(fluorescent.visible(am));
-					view.refreshMap();
-				}
-			});
-		}
+		final MapInfoControlRegInfo fluorescent = mapInfoControls.registerAppearanceWidget(0, R.string.map_widget_fluorescent,
+				"fluorescent", EnumSet.noneOf(ApplicationMode.class));
+		fluorescent.setStateChangeListener(new Runnable() {
+			@Override
+			public void run() {
+				ApplicationMode am = view.getSettings().getApplicationMode();
+				view.getSettings().FLUORESCENT_OVERLAYS.set(fluorescent.visible(am));
+				view.refreshMap();
+			}
+		});
 	}
 	
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 20bd0194fe..4a74a67916 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -232,7 +232,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	
 	
 	private void registerAppearanceWidgets() {
-		final MapInfoControlRegInfo showRuler = mapInfoControls.registerAppearanceWidget(0, R.string.map_widget_transparent, 
+		final MapInfoControlRegInfo showRuler = mapInfoControls.registerAppearanceWidget(0, R.string.map_widget_show_ruler, 
 				"showRuler", EnumSet.allOf(ApplicationMode.class));
 		showRuler.setStateChangeListener(new Runnable() {
 			@Override