diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index a81fbff5f8..2441fa5e16 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-<PreferenceCategory android:title="@string/profile_settings">
+<PreferenceCategory android:title="@string/profile_settings" android:key="profile_dep_cat">
 	<ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference>
 
 	<PreferenceScreen android:key="map_settings" android:title="@string/rendering_settings" android:summary="@string/rendering_settings_descr">
diff --git a/OsmAnd/src/net/osmand/plus/activities/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/activities/ApplicationMode.java
index 391aea0c88..32fc9a9f86 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ApplicationMode.java
@@ -19,8 +19,8 @@ public enum ApplicationMode {
 		this.key = key;
 	}
 
-	public static String toHumanString(ApplicationMode m, Context ctx) {
-		return ctx.getResources().getString(m.key);
+	public String toHumanString(Context ctx) {
+		return ctx.getResources().getString(key);
 	}
 
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index aa4b321c1b..9b174fe345 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -57,6 +57,8 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.util.AttributeSet;
+import android.view.View;
 import android.widget.Toast;
 
 public class SettingsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnPreferenceClickListener {
@@ -321,7 +323,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		
 		entries = new String[ApplicationMode.values().length];
 		for(int i=0; i<entries.length; i++){
-			entries[i] = ApplicationMode.toHumanString(ApplicationMode.values()[i], this);
+			entries[i] = ApplicationMode.values()[i].toHumanString(this);
 		}
 		registerListPreference(osmandSettings.APPLICATION_MODE, screen, entries, ApplicationMode.values());
 		
@@ -501,7 +503,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		
 		updateApplicationDirTextAndSummary();
 
-		applicationModePreference.setTitle(getString(R.string.settings_preset) + "  [" + ApplicationMode.toHumanString(osmandSettings.APPLICATION_MODE.get(), this) + "]");
+		applicationModePreference.setTitle(getString(R.string.settings_preset) + "  [" + osmandSettings.APPLICATION_MODE.get().toHumanString(this) + "]");
 		dayNightModePreference.setSummary(getString(R.string.daynight_descr) + "  [" + osmandSettings.DAYNIGHT_MODE.get().toHumanString(this) + "]");
 		routerServicePreference.setSummary(getString(R.string.router_service_descr) + "  [" + osmandSettings.ROUTER_SERVICE.get() + "]");
 
@@ -797,6 +799,13 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 	@Override
 	public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
 			Preference preference) {
+		//customize the sub-preference title according the selected profile
+		if (preference.getKey() != null && preference instanceof PreferenceScreen && 
+				((PreferenceCategory)findPreference("profile_dep_cat")).findPreference(preference.getKey()) != null) {
+			PreferenceScreen scr = (PreferenceScreen)preference;
+			scr.getDialog().setTitle(scr.getTitle() + " [" + osmandSettings.APPLICATION_MODE.get().toHumanString(this) + "]");
+		}
+		
 		if (preference == applicationDir) {
 			return true;
 		}