diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
index 963e24db23..aa982640fe 100644
--- a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
+++ b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
@@ -77,20 +77,26 @@ public class MapPoiTypes {
 		return otherCategory;
 	}
 	
-	public Map<String, PoiType> getAllTranslatedNames() {
+	public Map<String, PoiType> getAllTranslatedNames(boolean onlyTranslation) {
 		Map<String, PoiType> translation = new TreeMap<String, PoiType>(); 
 		for(PoiCategory pc : categories) {
 			for(PoiType pt :  pc.getPoiTypes()) {
 				translation.put(pt.getTranslation(), pt);
+				if (!onlyTranslation) {
+					translation.put(Algorithms.capitalizeFirstLetterAndLowercase(pt.getKeyName().replace('_', ' ')), pt);
+				}
 			}
 		}
 		return translation;
 	}
 	
-	public Map<String, PoiType> getAllTranslatedNames(PoiCategory pc) {
+	public Map<String, PoiType> getAllTranslatedNames(PoiCategory pc, boolean onlyTranslation) {
 		Map<String, PoiType> translation = new TreeMap<String, PoiType>();
 		for (PoiType pt : pc.getPoiTypes()) {
 			translation.put(pt.getTranslation(), pt);
+			if (!onlyTranslation) {
+				translation.put(pt.getKeyName(), pt);
+			}
 		}
 		return translation;
 	}
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 7175168a22..89803badfc 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -310,6 +310,7 @@ dependencies {
 					"OsmAndCore_android.jar",
 					"OsmAndCore_wrapper.jar"])
 	compile "com.android.support:appcompat-v7:21.0.3"
+	compile "com.github.shell-software:fab:1.0.5"
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
diff --git a/OsmAnd/build.gradle~ b/OsmAnd/build.gradle~
new file mode 100644
index 0000000000..7175168a22
--- /dev/null
+++ b/OsmAnd/build.gradle~
@@ -0,0 +1,318 @@
+apply plugin: 'com.android.application'
+
+// Global Paramers accepted
+// APK_NUMBER_VERSION - version number of apk
+// APK_VERSION - build number like #9999Z, for dev builds appended to app_version like 2.0.0 in no_translate.xml)
+//               flavor                 Z : M=-master, D=-design, B=-Blackberry, MD=-main-default, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
+// TARGET_APP_NAME - app name
+// APP_EDITION - date stamp of builds
+// APP_FEATURES - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
+
+// TODO
+// 1. Filter fonts
+// <unzip src="OsmAndCore_android.aar" dest=".">
+//            <patternset>
+//                <include name="assets/**/map/fonts/OpenSans/*"/>
+//                <include name="assets/**/map/fonts/NotoSans/*"/>
+//            </patternset>
+//        </unzip>
+// Less important
+// 2. fix_apostrophe_issues (replace match="[^=]([^\\])'" replace="\1\\\\'") res/**/strings.xml
+// 3. sherpafy/free/paid
+// 4. Release signature
+// 5. TARGET_APP_NAME, APP_EDITION uses flavor
+
+android {
+	compileSdkVersion 21
+	buildToolsVersion "21.1.2"
+
+	signingConfigs {
+		development {
+			storeFile file("../keystores/debug.keystore")
+			storePassword "android"
+			keyAlias "androiddebugkey"
+			keyPassword "android"
+		}
+
+		publishing {
+			storeFile file("osmand_key")
+			storePassword System.getenv("OSMAND_APK_PASSWORD")
+			keyAlias "androiddebugkey"
+			keyPassword System.getenv("OSMAND_APK_PASSWORD")
+		}
+	}
+
+	defaultConfig {
+		minSdkVersion 9
+		targetSdkVersion 21
+
+		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
+		//versionName already assigned in code
+		//versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
+	}
+
+	lintOptions {
+		lintConfig file("lint.xml")
+		abortOnError false
+		warningsAsErrors false
+	}
+
+	// This is from OsmAndCore_android.aar - for some reason it's not inherited
+	aaptOptions {
+		// Don't compress any embedded resources
+		noCompress "qz"
+	}
+
+	dexOptions {
+		jumboMode = true
+	}
+
+	sourceSets {
+		main {
+			manifest.srcFile "AndroidManifest.xml"
+			jni.srcDirs = []
+			jniLibs.srcDirs = ["libs"]
+			aidl.srcDirs = ["src"]
+			java.srcDirs = ["src"]
+			resources.srcDirs = ["src"]
+			renderscript.srcDirs = ["src"]
+			res.srcDirs = ["res"]
+			assets.srcDirs = ["assets"]
+		}
+		free {
+			manifest.srcFile "AndroidManifest-free.xml"
+		}
+
+		legacy {
+			jniLibs.srcDirs = ["libgnustl"]
+		}
+	}
+
+	flavorDimensions "version", "coreversion", "abi"
+	productFlavors {
+		// ABI
+		armv7 {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "armeabi-v7a"
+			}
+		}
+		armv5 {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "armeabi"
+			}
+		}
+		x86 {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "x86"
+			}
+		}
+		mips {
+			flavorDimension "abi"
+			ndk {
+				abiFilter "mips"
+			}
+		}
+		fat {
+			flavorDimension "abi"
+		}
+
+		// Version
+		free {
+			flavorDimension "version"
+			applicationId "net.osmand"
+		}
+		full {
+			flavorDimension "version"
+			applicationId "net.osmand.plus"
+		}
+
+		// CoreVersion
+		legacy {
+			flavorDimension "coreversion"
+		}
+
+		qtcore {
+			flavorDimension "coreversion"
+		}
+
+		qtcoredebug {
+			flavorDimension "coreversion"
+		}
+	}
+
+	buildTypes {
+		debug {
+			signingConfig signingConfigs.development
+		}
+		release {
+			signingConfig signingConfigs.publishing
+		}
+	}
+}
+
+def replaceNoTranslate(line) {
+	if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_NAME")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
+	}
+	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
+	}
+	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION")) {
+		// appends build number to version number for dev builds
+		return line.replaceAll("</", System.getenv("APK_VERSION") + "</")
+	}
+	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")
+	}
+	return line;
+}
+
+task updateNoTranslate(type: Copy) {
+	inputs.property 'appName', System.getenv().get("APP_NAME")
+	inputs.property 'appEdition', System.getenv().get("APP_EDITION")
+	inputs.property 'appFeatures', System.getenv().get("APP_FEATURES")
+	inputs.property 'apkVersion', System.getenv().get("APK_VERSION")
+	from('.') {
+		include 'no_translate.xml'
+		filter {
+			line -> replaceNoTranslate(line);
+		}
+	}
+	into 'res/values/'
+}
+
+task collectVoiceAssets(type: Sync) {
+	from "../../resources/voice"
+	into "assets/voice"
+	include "**/*.p"
+}
+
+task collectSpecialPhrasesAssets(type: Sync) {
+	from "../../resources/specialphrases"
+	into "assets/specialphrases"
+	include "*.txt"
+}
+
+task collectHelpContentsAssets(type: Sync) {
+	from "../../help"
+	into "assets/help"
+	include "*.html"
+	include "images/**/*.png"
+
+	from "assets/"
+	into "assets/help"
+	include "style.css"
+}
+
+task collectRoutingResources(type: Sync) {
+	from "../../resources/routing"
+	into "src/net/osmand/router"
+	include "*.xml"
+}
+
+task collectMiscResources(type: Copy) {
+	into "src/net/osmand/osm"
+	from("../../resources/obf_creation") {
+		include "rendering_types.xml"
+	}
+	from("../../resources/poi") {
+		include "poi_types.xml"
+	}
+}
+
+task collectRenderingStylesResources(type: Sync) {
+	from "../../resources/rendering_styles"
+	into "src/net/osmand/render"
+	include "*.xml"
+}
+
+task collectRegionsInfoResources(type: Copy) {
+	from "../../resources/countries-info"
+	into "src/net/osmand/map"
+	include "regions.ocbf"
+}
+
+task copyStyleIcons(type: Copy) {
+	from "../../resources/rendering_styles/style-icons/"
+	into "res/"
+	include "**/*.png"
+}
+
+task collectExternalResources << {}
+collectExternalResources.dependsOn collectVoiceAssets,
+		collectSpecialPhrasesAssets,
+		collectHelpContentsAssets,
+		collectRoutingResources,
+		collectRenderingStylesResources,
+		collectRegionsInfoResources,
+		collectMiscResources,
+		copyStyleIcons,
+		updateNoTranslate
+tasks.whenTaskAdded { task ->
+	if (task.name.startsWith("generate") && task.name.endsWith("Resources")) {
+		task.dependsOn collectExternalResources
+	}
+}
+
+// Legacy core build
+import org.apache.tools.ant.taskdefs.condition.Os
+
+task buildOsmAndCore(type: Exec) {
+	description "Build Legacy OsmAndCore"
+
+	if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+		commandLine "bash", file("./old-ndk-build.sh").getAbsolutePath()
+	} else {
+		commandLine "cmd", "/c", "echo", "Not supported"
+	}
+}
+
+task cleanupDuplicatesInCore() {
+	dependsOn buildOsmAndCore
+	// doesn't work for legacy debug builds
+	doLast {
+		file("libgnustl/armeabi").mkdirs()
+		println file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so"))
+		file("libgnustl/armeabi-v7a").mkdirs()
+		println file("libs/armeabi-v7a/libgnustl_shared.so").renameTo(file("libgnustl/armeabi-v7a/libgnustl_shared.so"))
+		file("libgnustl/mips").mkdirs()
+		println file("libs/mips/libgnustl_shared.so").renameTo(file("libgnustl/mips/libgnustl_shared.so"))
+		file("libgnustl/x86").mkdirs()
+		println file("libs/x86/libgnustl_shared.so").renameTo(file("libgnustl/x86/libgnustl_shared.so"))
+	}
+}
+tasks.withType(JavaCompile) {
+	compileTask -> compileTask.dependsOn << [buildOsmAndCore, cleanupDuplicatesInCore]
+}
+
+repositories {
+	ivy {
+		name = "OsmAndBinariesIvy"
+		url = "http://builder.osmand.net"
+		layout "pattern", {
+			artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
+		}
+	}
+}
+
+dependencies {
+	compile project(path: ":OsmAnd-java", configuration: "android")
+	compile fileTree(
+			dir: "libs",
+			include: ["*.jar"],
+			exclude: [
+					"QtAndroid-bundled.jar",
+					"QtAndroidAccessibility-bundled.jar",
+					"android-support*.jar",
+					"OsmAndCore_android.jar",
+					"OsmAndCore_wrapper.jar"])
+	compile "com.android.support:appcompat-v7:21.0.3"
+	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
+	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+	qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+}
diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties
index d0ba12ed4b..a19f136385 100644
--- a/OsmAnd/project.properties
+++ b/OsmAnd/project.properties
@@ -13,3 +13,4 @@ split.density=false
 target=android-21
 dex.force.jumbo=true
 android.library.reference.1=../appcompat
+android.library.reference.2=../eclipse-compile/fab
diff --git a/OsmAnd/res/drawable-hdpi/ic_group_add.png b/OsmAnd/res/drawable-hdpi/ic_group_add.png
new file mode 100644
index 0000000000..f48bff4b32
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_group_add.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png
index 88f5fe591e..dabfb4835c 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png and b/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled_white.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled_white.png
index e1551c09e7..38976505df 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled_white.png and b/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png
index 3347443c08..11567f3e64 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png and b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png
index a96327e764..62c934c3ad 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png and b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png
index 94034f03a5..607bbc35bd 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png and b/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked_white.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked_white.png
index 08810a75f5..4bd74864e3 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked_white.png and b/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass.png b/OsmAnd/res/drawable-hdpi/map_compass.png
index b8f95f0315..e852a4db1d 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_compass.png and b/OsmAnd/res/drawable-hdpi/map_compass.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_bearing.png b/OsmAnd/res/drawable-hdpi/map_compass_bearing.png
index 5818cc9ea7..525fec8476 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_compass_bearing.png and b/OsmAnd/res/drawable-hdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png
index 5818cc9ea7..dff3bbb54a 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png and b/OsmAnd/res/drawable-hdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_niu.png b/OsmAnd/res/drawable-hdpi/map_compass_niu.png
index f8e94a3501..3ae3157990 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_compass_niu.png and b/OsmAnd/res/drawable-hdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-hdpi/map_compass_niu_white.png
index 1c82ca78c4..d8091994d8 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_compass_niu_white.png and b/OsmAnd/res/drawable-hdpi/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_compass_white.png b/OsmAnd/res/drawable-hdpi/map_compass_white.png
index 320c2b50d2..89792f78b9 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_compass_white.png and b/OsmAnd/res/drawable-hdpi/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_group_add.png b/OsmAnd/res/drawable-mdpi/ic_group_add.png
new file mode 100644
index 0000000000..9f948ed8b8
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_group_add.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled.png
new file mode 100644
index 0000000000..a22621ad7b
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled_white.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled_white.png
new file mode 100644
index 0000000000..1c0255e8d6
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled.png
new file mode 100644
index 0000000000..84756c6372
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled_white.png
new file mode 100644
index 0000000000..354001b060
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked.png
new file mode 100644
index 0000000000..728cab0b10
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked_white.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked_white.png
new file mode 100644
index 0000000000..8ff602b697
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_compass.png b/OsmAnd/res/drawable-mdpi/map_compass.png
new file mode 100644
index 0000000000..82ee8e66f6
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_compass.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_compass_bearing.png b/OsmAnd/res/drawable-mdpi/map_compass_bearing.png
new file mode 100644
index 0000000000..4617da83fa
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-mdpi/map_compass_bearing_white.png
new file mode 100644
index 0000000000..680be485dd
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_compass_niu.png b/OsmAnd/res/drawable-mdpi/map_compass_niu.png
new file mode 100644
index 0000000000..5207161498
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-mdpi/map_compass_niu_white.png
new file mode 100644
index 0000000000..8b3af153db
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_compass_white.png b/OsmAnd/res/drawable-mdpi/map_compass_white.png
new file mode 100644
index 0000000000..d4bc6f10fd
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_group_add.png b/OsmAnd/res/drawable-xhdpi/ic_group_add.png
new file mode 100644
index 0000000000..bdb8250bc9
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_group_add.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled.png
new file mode 100644
index 0000000000..0ae0d0a3c0
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled_white.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled_white.png
new file mode 100644
index 0000000000..d043af97cc
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled.png
new file mode 100644
index 0000000000..7bcb3fb060
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled_white.png
new file mode 100644
index 0000000000..66ec312e59
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked.png
new file mode 100644
index 0000000000..0ab76663f3
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked_white.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked_white.png
new file mode 100644
index 0000000000..ebf291c445
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_compass.png b/OsmAnd/res/drawable-xhdpi/map_compass.png
new file mode 100644
index 0000000000..d953bc4d09
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_compass.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_bearing.png b/OsmAnd/res/drawable-xhdpi/map_compass_bearing.png
new file mode 100644
index 0000000000..ef302192a3
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-xhdpi/map_compass_bearing_white.png
new file mode 100644
index 0000000000..d8d2dd9fa7
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_niu.png b/OsmAnd/res/drawable-xhdpi/map_compass_niu.png
new file mode 100644
index 0000000000..05f8351357
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-xhdpi/map_compass_niu_white.png
new file mode 100644
index 0000000000..8d5dcf79fa
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_compass_white.png b/OsmAnd/res/drawable-xhdpi/map_compass_white.png
new file mode 100644
index 0000000000..3752f958d7
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_group_add.png b/OsmAnd/res/drawable-xxhdpi/ic_group_add.png
new file mode 100644
index 0000000000..7f2570d455
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_group_add.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled.png
new file mode 100644
index 0000000000..e7c01c8476
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled_white.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled_white.png
new file mode 100644
index 0000000000..c0d0dba435
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled.png
new file mode 100644
index 0000000000..edda237eaf
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled_white.png
new file mode 100644
index 0000000000..eaa52f5781
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked.png
new file mode 100644
index 0000000000..5cfaea3052
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked_white.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked_white.png
new file mode 100644
index 0000000000..15370b493e
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass.png b/OsmAnd/res/drawable-xxhdpi/map_compass.png
new file mode 100644
index 0000000000..f6ab0bcc4f
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_compass.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_bearing.png b/OsmAnd/res/drawable-xxhdpi/map_compass_bearing.png
new file mode 100644
index 0000000000..639449d194
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-xxhdpi/map_compass_bearing_white.png
new file mode 100644
index 0000000000..ec3ad49afd
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_niu.png b/OsmAnd/res/drawable-xxhdpi/map_compass_niu.png
new file mode 100644
index 0000000000..1e039c7f47
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-xxhdpi/map_compass_niu_white.png
new file mode 100644
index 0000000000..8c954c1a42
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_compass_white.png b/OsmAnd/res/drawable-xxhdpi/map_compass_white.png
new file mode 100644
index 0000000000..0cba24e521
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable/dash_parking_dark.xml b/OsmAnd/res/drawable/dash_parking_dark.xml
new file mode 100644
index 0000000000..b416e9a9b7
--- /dev/null
+++ b/OsmAnd/res/drawable/dash_parking_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@color/dashboard_parking_dark_selected" android:state_enabled="false"/>
+	<item android:drawable="@color/dashboard_parking_dark_selected" android:state_pressed="true"/>
+	<item android:drawable="@color/dashboard_parking_dark_selected" android:state_focused="true"/>
+	<item android:drawable="@color/dashboard_parking_dark_color"/>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/dash_parking_light.xml b/OsmAnd/res/drawable/dash_parking_light.xml
new file mode 100644
index 0000000000..36da79539a
--- /dev/null
+++ b/OsmAnd/res/drawable/dash_parking_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_enabled="false" android:drawable="@color/parking_card_selected" />
+	<item android:state_pressed="true" android:drawable="@color/parking_card_selected" />
+	<item android:state_focused="true" android:drawable="@color/parking_card_selected" />
+	<item android:drawable="@color/dashboard_blue" />
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-v14/osmo_groups_list_header.xml b/OsmAnd/res/layout-v14/osmo_groups_list_header.xml
index abf588770a..8f3b5720c3 100644
--- a/OsmAnd/res/layout-v14/osmo_groups_list_header.xml
+++ b/OsmAnd/res/layout-v14/osmo_groups_list_header.xml
@@ -1,91 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="5dp"
-    android:layout_marginLeft="5dp"
-    android:layout_marginRight="5dp"
-    android:layout_marginTop="5dp"
-    android:orientation="vertical" >
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/osmo_header_background"
+		android:minHeight="@dimen/osmo_header_height"
+		android:orientation="horizontal"
+		android:paddingLeft="@dimen/dashboard_parking_left_margin"
+		android:paddingRight="@dimen/dashboard_parking_left_margin">
 
-        <ImageView
-            android:id="@+id/osmo_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            android:src="@drawable/mon_osmo_conn_small" />
+		<ImageView
+			android:id="@+id/osmo_status"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:paddingLeft="4dp"
+			android:paddingRight="4dp"
+			android:src="@drawable/mon_osmo_conn_small"/>
 
-        <Switch
-            android:id="@+id/enable_service"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:gravity="center_vertical"
-            android:text="@string/osmo_start_service" />
-    </LinearLayout>
+		<Switch
+			android:id="@+id/enable_service"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:focusable="false"
+			android:textColor="@color/color_white"
+			android:text="@string/osmo_start_service"/>
+	</LinearLayout>
 
-    <RelativeLayout
-        android:id="@+id/osmo_log_off_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="3dp"
-        android:layout_marginTop="3dp" >
+	<RelativeLayout
+		android:id="@+id/osmo_log_off_layout"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
+		android:layout_marginRight="@dimen/dashboard_parking_left_margin"
+		android:minHeight="@dimen/osmo_header_height">
 
-        <TextView
-            android:id="@+id/osmo_user_name_text_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:text="@string/anonymous_user"
-            android:textAppearance="?android:attr/textAppearance" />
+		<TextView
+			android:id="@+id/osmo_user_name_text_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentLeft="true"
+			android:layout_centerVertical="true"
+			android:text="@string/anonymous_user"
+			android:textAppearance="?android:attr/textAppearance"/>
 
-        <Switch
-            android:id="@+id/osmo_login_logoff"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:focusable="false"
-            android:gravity="center_vertical" />
+		<Switch
+			android:id="@+id/osmo_login_logoff"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:focusable="false"
+			android:gravity="center_vertical"/>
 
-        <Button
-            android:id="@+id/osmo_login_hint_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/osmo_user_name_text_view"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
-            android:text="\?"
-            android:textAppearance="?android:attr/textAppearance" />
-        
-    </RelativeLayout>
+		<Button
+			android:id="@+id/osmo_login_hint_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toRightOf="@id/osmo_user_name_text_view"
+			android:minHeight="0dp"
+			android:minWidth="0dp"
+			android:text="\?"
+			android:textAppearance="?android:attr/textAppearance"/>
 
-    <Switch
-        android:id="@+id/enable_tracker"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:layout_marginLeft="3dp"
-        android:layout_marginTop="3dp"
-        android:gravity="center_vertical"
-        android:text="@string/osmo_enable_tracker" />
+	</RelativeLayout>
 
-    <TextView
-        android:id="@+id/motd"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dip"
-        android:autoLink="web"
-        android:gravity="center"
-        android:textSize="18sp" />
+	<Switch
+		android:id="@+id/enable_tracker"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
+		android:layout_marginRight="@dimen/dashboard_parking_left_margin"
+		android:focusable="false"
+		android:gravity="center_vertical"
+		android:minHeight="@dimen/osmo_header_height"
+		android:text="@string/osmo_enable_tracker"/>
+
+	<TextView
+		android:id="@+id/motd"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="8dip"
+		android:autoLink="web"
+		android:gravity="center"
+		android:textSize="18sp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_osmo_fragment.xml b/OsmAnd/res/layout/dash_osmo_fragment.xml
index 84f146d2d8..a7e9628382 100644
--- a/OsmAnd/res/layout/dash_osmo_fragment.xml
+++ b/OsmAnd/res/layout/dash_osmo_fragment.xml
@@ -1,77 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:background="?attr/card_bg"
 			  android:layout_width="match_parent"
-			  android:layout_height="match_parent">
-	<LinearLayout android:id="@+id/header_layout"
-				  android:orientation="horizontal"
-				  android:layout_width="fill_parent"
-				  android:layout_height="@dimen/dashHeaderHeight">
-		<TextView android:id="@+id/osmo_text"
-				  android:text="@string/map_widget_av_notes"
-				  style="?attr/dashboardSubHeaderStyle"/>
-		<Button android:id="@+id/manage"
-				android:text="@string/shared_string_show_all"
-				style="?attr/dashboardGeneralButtonStyle"/>
+			  android:layout_height="match_parent"
+			  android:background="?attr/card_bg"
+			  android:orientation="vertical">
+
+	<LinearLayout
+		android:id="@+id/header_layout"
+		android:layout_width="fill_parent"
+		android:layout_height="@dimen/dashHeaderHeight"
+		android:orientation="horizontal">
+
+		<TextView
+			android:id="@+id/osmo_text"
+			style="?attr/dashboardSubHeaderStyle"
+			android:text="@string/osmo"/>
+
+		<ProgressBar
+			android:id="@+id/progress"
+			android:visibility="gone"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:indeterminate="true"/>
+
+		<Button
+			android:id="@+id/manage"
+			style="?attr/dashboardGeneralButtonStyle"
+			android:text="@string/osm_editing_manage"/>
 	</LinearLayout>
 
-	<LinearLayout android:orientation="vertical"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
-		<LinearLayout android:orientation="horizontal"
-					  android:layout_width="fill_parent"
-					  android:layout_height="@dimen/dashHeaderHeight">
-			<TextView android:text="@string/shared_string_my_location"
-					  style="?attr/dashboardSubHeaderStyle"
-					  android:layout_weight="1"/>
-			<Button android:id="@+id/share"
-					android:text="@string/shared_string_show_all"
-					style="?attr/dashboardGeneralButtonStyle"/>
-			<include layout="@layout/check_item_rel" />
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="@dimen/dashHeaderHeight"
+			android:orientation="horizontal">
+
+			<TextView
+				style="?attr/dashboardSubHeaderStyle"
+				android:layout_weight="1"
+				android:text="@string/shared_string_my_location"/>
+
+			<ImageButton
+				android:id="@+id/share"
+				style="?attr/dashboardGeneralButtonStyle"
+				android:text="@string/shared_string_show_all"/>
+
+			<include layout="@layout/check_item_rel"/>
 		</LinearLayout>
 
 		<View
-			android:background="?attr/dashboard_divider"
 			android:layout_width="match_parent"
-			android:layout_height="1dp"/>
+			android:layout_height="1dp"
+			android:background="?attr/dashboard_divider"/>
 
-		<LinearLayout android:orientation="horizontal"
-					  android:layout_width="match_parent"
-					  android:layout_height="wrap_content">
-			<ImageView android:id="@+id/points_icon"
-					   android:layout_marginLeft="@dimen/subHeaderMarginLeft"
-					   android:src="@drawable/ic_small_point"
-					   android:layout_width="wrap_content"
-					   android:layout_height="wrap_content"/>
-			<TextView android:id="@+id/points_count"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"/>
+		<LinearLayout
+			android:visibility="gone"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
 
-			<ImageView android:id="@+id/distance_icon"
-					   android:src="@drawable/ic_small_distance"
-					   android:layout_width="wrap_content"
-					   android:layout_height="wrap_content"/>
-			<TextView android:id="@+id/distance"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"/>
+			<ImageView
+				android:id="@+id/points_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="@dimen/subHeaderMarginLeft"
+				android:src="@drawable/ic_small_point"/>
 
-			<ImageView android:id="@+id/time_icon"
-					   android:src="@drawable/ic_small_time"
-					   android:layout_width="wrap_content"
-					   android:layout_height="wrap_content"/>
-			<TextView android:id="@+id/time"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"
-					  android:layout_marginRight="@dimen/showAllButtonMarginRight"/>
+			<TextView
+				android:id="@+id/points_count"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<ImageView
+				android:id="@+id/distance_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/ic_small_distance"/>
+
+			<TextView
+				android:id="@+id/distance"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<ImageView
+				android:id="@+id/time_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/ic_small_time"/>
+
+			<TextView
+				android:id="@+id/time"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginRight="@dimen/showAllButtonMarginRight"/>
 		</LinearLayout>
 
 	</LinearLayout>
 
-	<LinearLayout android:orientation="vertical"
-				  android:id="@+id/items"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content"/>
+	<LinearLayout
+		android:id="@+id/items"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"/>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml
index 8f867bb58d..9c93d7ef84 100644
--- a/OsmAnd/res/layout/dash_parking_fragment.xml
+++ b/OsmAnd/res/layout/dash_parking_fragment.xml
@@ -7,6 +7,7 @@
 			  android:orientation="vertical">
 
 	<LinearLayout
+		android:id="@+id/parking_header"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/dash_parking_height"
 		android:background="?attr/dash_parking_bg"
@@ -62,6 +63,7 @@
 
 			<TextView
 				android:id="@+id/left_lbl"
+				android:layout_gravity="right"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/osmand_parking_time_left"
diff --git a/OsmAnd/res/layout/osmo_create_group.xml b/OsmAnd/res/layout/osmo_create_group.xml
index bff452e3f0..7d4c04bd69 100644
--- a/OsmAnd/res/layout/osmo_create_group.xml
+++ b/OsmAnd/res/layout/osmo_create_group.xml
@@ -1,101 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:paddingBottom="@dimen/dialog_content_bottom_margin"
+			android:paddingLeft="@dimen/dialog_content_margin"
+			android:paddingRight="@dimen/dialog_content_margin"
+			android:paddingTop="@dimen/dialog_content_bottom_margin">
 
-    <TableLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="7dp"
-        android:paddingRight="7dp"
-        android:stretchColumns="1">
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingLeft="7dp"
+		android:paddingRight="7dp"
+		android:stretchColumns="1">
 
-        <TableRow>
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/osmo_group_name"/>
 
-            <TextView
-                android:paddingLeft="3dp"
-                android:layout_span="2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/osmo_group_create_info"
-                android:textSize="18sp"
-                android:drawableRight="@drawable/ic_action_info_dark"
-                android:text="@string/osmo_group_information" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:paddingLeft="3dp"
-                android:id="@+id/osmo_group_create_dinfo"
-                android:textSize="16sp"
-                android:layout_span="2"
-                android:minLines="3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_group_information_desc"
-                android:animateLayoutChanges="true"
-                android:visibility="gone" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_group_name" />
-
-            <EditText
-                android:id="@+id/Name"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="3dp" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_group_description" />
-
-            <EditText
-                android:id="@+id/Description"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:lines="3"
-                android:paddingLeft="3dp" />
-        </TableRow>
+		<EditText
+			android:id="@+id/Name"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"/>
 
 
-        <TableRow>
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/osmo_group_description"/>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_group_by_invite" />
+		<EditText
+			android:id="@+id/Description"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"/>
 
-            <CheckBox
-                android:id="@+id/OnlyByInvite"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="3dp" />
-        </TableRow>
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/osmo_group_policy"/>
 
-        <TableRow>
+		<EditText
+			android:id="@+id/Policy"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"/>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/osmo_group_policy" />
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/Policy"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:lines="2"
-                android:paddingLeft="3dp" />
-        </TableRow>
-    </TableLayout>
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/osmo_group_by_invite"/>
+
+			<CheckBox
+				android:id="@+id/OnlyByInvite"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+		</LinearLayout>
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<TextView
+				android:id="@+id/osmo_group_create_info"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_weight="1"
+				android:text="@string/osmo_group_information"
+				android:textSize="18sp"/>
+
+			<ImageButton
+				android:id="@+id/info"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:background="?attr/options_button_background"
+				android:src="@drawable/ic_action_info_dark"/>
+		</LinearLayout>
+
+		<TextView
+			android:id="@+id/osmo_group_create_dinfo"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/osmo_group_information_desc"
+			android:textSize="16sp"
+			android:visibility="gone"/>
+	</LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_edit_device.xml b/OsmAnd/res/layout/osmo_edit_device.xml
index 7df448d980..49b35ae1bf 100644
--- a/OsmAnd/res/layout/osmo_edit_device.xml
+++ b/OsmAnd/res/layout/osmo_edit_device.xml
@@ -2,8 +2,10 @@
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="7dp"
-    android:paddingRight="7dp"
+	android:paddingBottom="@dimen/dialog_content_bottom_margin"
+	android:paddingTop="@dimen/dialog_content_bottom_margin"
+    android:paddingLeft="@dimen/dialog_content_margin"
+    android:paddingRight="@dimen/dialog_content_margin"
     android:stretchColumns="1">
 
     <TableRow>
diff --git a/OsmAnd/res/layout/osmo_group_item.xml b/OsmAnd/res/layout/osmo_group_item.xml
index 41d809d566..3f0e35d101 100644
--- a/OsmAnd/res/layout/osmo_group_item.xml
+++ b/OsmAnd/res/layout/osmo_group_item.xml
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/expandable_category_color"
-    android:paddingBottom="5dp"
-    android:paddingLeft="3dp"
-    android:paddingRight="4dp"
-    android:paddingTop="5dp">
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:paddingBottom="5dp"
+			  android:paddingLeft="3dp"
+			  android:paddingRight="4dp"
+			  android:paddingTop="5dp">
 
-    <ImageView
-        android:id="@+id/explist_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="6dp"
-        android:src="@drawable/expandable_category_unpushed" />
+	<ImageView
+		android:id="@+id/explist_indicator"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:paddingLeft="6dp"
+		android:src="@drawable/expandable_category_unpushed"/>
 
-    <TextView
-        android:id="@+id/category_name"
-        style="@style/ListText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-		android:textColor="?android:textColorPrimary"
-        android:layout_marginLeft="8dp"
+	<TextView
+		android:id="@+id/category_name"
+		style="@style/ListText"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="8dp"
+		android:layout_marginTop="0dp"
+		android:layout_weight="1"
 		android:maxLines="1"
-		tools:text="@string/lorem_ipsum"
-        android:layout_marginTop="0dp"
-        android:layout_weight="1"
-        android:textSize="18sp" />
+		android:textColor="?android:textColorPrimary"
+		android:textSize="18sp"
+		tools:text="@string/lorem_ipsum"/>
 
-    <include layout="@layout/check_item_rel" />
+	<include layout="@layout/check_item_rel"/>
 
 
 	<ImageView
diff --git a/OsmAnd/res/layout/osmo_group_list.xml b/OsmAnd/res/layout/osmo_group_list.xml
index cc0fb62419..8a1dd04ba1 100644
--- a/OsmAnd/res/layout/osmo_group_list.xml
+++ b/OsmAnd/res/layout/osmo_group_list.xml
@@ -25,4 +25,10 @@
 			android:layout_weight="1"
 			android:groupIndicator="@android:color/transparent"/>
 
+	<net.osmand.plus.activities.search.toolbar.SplitToolbar
+		android:id="@+id/bottomControls"
+		android:background="?attr/bottomToolBarColor"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_group_list_item.xml b/OsmAnd/res/layout/osmo_group_list_item.xml
index 6f742f31a1..845162bdfb 100644
--- a/OsmAnd/res/layout/osmo_group_list_item.xml
+++ b/OsmAnd/res/layout/osmo_group_list_item.xml
@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingBottom="5dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="4dp"
-    android:paddingTop="5dp">
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:background="?attr/expandable_list_item_background"
+			  android:orientation="horizontal"
+			  android:paddingBottom="5dp"
+			  android:paddingLeft="8dp"
+			  android:paddingRight="4dp"
+			  android:paddingTop="5dp">
 
-    <ImageView
-        android:id="@+id/osmo_user_icon"
-        android:layout_width="26dp"
-        android:layout_height="26dp"
-        android:paddingRight="2dp"
-        android:paddingTop="2dp" />
+	<ImageView
+		android:id="@+id/osmo_user_icon"
+		android:layout_width="26dp"
+		android:layout_height="26dp"
+		android:paddingRight="2dp"
+		android:paddingTop="2dp"/>
 
-    <TextView
-        android:id="@+id/osmo_label"
-        style="@style/ListText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:maxLines="7"
-        android:layout_weight="1" />
+	<TextView
+		android:id="@+id/osmo_label"
+		style="@style/ListText"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="10dp"
+		android:layout_weight="1"
+		android:maxLines="7"
+		tools:text="@string/abc_action_bar_home_description"
+		android:textColor="?android:textColorPrimary"/>
 
-    <TextView
-        android:id="@+id/osmo_label_time"
-        style="@style/ListText.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="3dp" />
+	<TextView
+		android:id="@+id/osmo_label_time"
+		style="@style/ListText.Small"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="3dp"/>
 
-    <!-- <include layout="@layout/check_item" />  -->
+	<!-- <include layout="@layout/check_item" />  -->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_groups_list_header.xml b/OsmAnd/res/layout/osmo_groups_list_header.xml
index fef215e96b..b9aad04a9b 100644
--- a/OsmAnd/res/layout/osmo_groups_list_header.xml
+++ b/OsmAnd/res/layout/osmo_groups_list_header.xml
@@ -1,91 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="5dp"
-    android:layout_marginLeft="5dp"
-    android:layout_marginTop="5dp"
-    android:layout_marginRight="5dp"
-    android:orientation="vertical">
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/osmo_header_background"
+		android:minHeight="@dimen/osmo_header_height"
+		android:orientation="horizontal"
+		android:paddingLeft="@dimen/dashboard_parking_left_margin"
+		android:paddingRight="@dimen/dashboard_parking_left_margin">
 
-        <ImageView
-            android:id="@+id/osmo_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            android:src="@drawable/mon_osmo_conn_small" />
+		<ImageView
+			android:id="@+id/osmo_status"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:paddingLeft="4dp"
+			android:paddingRight="4dp"
+			android:src="@drawable/mon_osmo_conn_small"/>
 
-        <CheckBox
-            android:id="@+id/enable_service"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:gravity="center_vertical"
-            android:text="@string/osmo_start_service" />
-    </LinearLayout>
+		<CheckBox
+			android:id="@+id/enable_service"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:focusable="false"
+			android:textColor="@color/color_white"
+			android:text="@string/osmo_start_service"/>
+	</LinearLayout>
 
-    <RelativeLayout
-        android:id="@+id/osmo_log_off_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="3dp"
-        android:layout_marginTop="3dp">
+	<RelativeLayout
+		android:id="@+id/osmo_log_off_layout"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
+		android:layout_marginRight="@dimen/dashboard_parking_left_margin"
+		android:minHeight="@dimen/osmo_header_height">
 
-        <TextView
-            android:id="@+id/osmo_user_name_text_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:text="@string/anonymous_user"
-            android:textAppearance="?android:attr/textAppearance" />
+		<TextView
+			android:id="@+id/osmo_user_name_text_view"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentLeft="true"
+			android:layout_centerVertical="true"
+			android:text="@string/anonymous_user"
+			android:textAppearance="?android:attr/textAppearance"/>
 
-        <CheckBox
-            android:id="@+id/osmo_login_logoff"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:focusable="false"
-            android:gravity="center_vertical" />
+		<CheckBox
+			android:id="@+id/osmo_login_logoff"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:focusable="false"
+			android:gravity="center_vertical"/>
 
-        <Button
-            android:id="@+id/osmo_login_hint_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/osmo_user_name_text_view"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
-            android:text="\?"
-            android:textAppearance="?android:attr/textAppearance" />
+		<Button
+			android:id="@+id/osmo_login_hint_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toRightOf="@id/osmo_user_name_text_view"
+			android:minHeight="0dp"
+			android:minWidth="0dp"
+			android:text="\?"
+			android:textAppearance="?android:attr/textAppearance"/>
 
-    </RelativeLayout>
+	</RelativeLayout>
 
-    <CheckBox
-        android:id="@+id/enable_tracker"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:layout_marginLeft="3dp"
-        android:layout_marginTop="3dp"
-        android:gravity="center_vertical"
-        android:text="@string/osmo_enable_tracker" />
+	<CheckBox
+		android:id="@+id/enable_tracker"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
+		android:layout_marginRight="@dimen/dashboard_parking_left_margin"
+		android:checked="false"
+		android:focusable="false"
+		android:gravity="center_vertical"
+		android:minHeight="@dimen/osmo_header_height"
+		android:text="@string/osmo_enable_tracker"/>
 
-    <TextView
-        android:id="@+id/motd"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dip"
-        android:autoLink="web"
-        android:gravity="center"
-        android:textSize="18sp" />
+	<TextView
+		android:id="@+id/motd"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:autoLink="web"
+		android:gravity="center"
+		android:textSize="18sp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/parking_set_time_limit.xml b/OsmAnd/res/layout/parking_set_time_limit.xml
index bc17432004..af7ad29dc3 100644
--- a/OsmAnd/res/layout/parking_set_time_limit.xml
+++ b/OsmAnd/res/layout/parking_set_time_limit.xml
@@ -1,48 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+			  android:layout_width="wrap_content"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical"
+			  android:paddingBottom="@dimen/dialog_content_bottom_margin"
+			  android:paddingLeft="@dimen/dialog_content_margin"
+			  android:paddingRight="@dimen/dialog_content_margin"
+			  android:paddingTop="@dimen/dialog_content_bottom_margin">
 
-    <TextView
-        android:id="@+id/parkTime"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_gravity="center"
-        android:text="@string/osmand_parking_position_description_add" />
+	<TextView
+		android:id="@+id/parkTime"
+		android:layout_width="wrap_content"
+		android:layout_height="30dp"
+		android:layout_gravity="center"
+		android:text="@string/osmand_parking_position_description_add"/>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal">
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_gravity="center_horizontal"
+		android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/textView1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/osmand_parking_hours" />
+		<TextView
+			android:id="@+id/textView1"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:text="@string/osmand_parking_hours"/>
 
-        <TimePicker
-            android:id="@+id/parking_time_picker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+		<TimePicker
+			android:id="@+id/parking_time_picker"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
 
-        <TextView
-            android:id="@+id/textView2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/osmand_parking_minutes" />
+		<TextView
+			android:id="@+id/textView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:text="@string/osmand_parking_minutes"/>
 
-    </LinearLayout>
+	</LinearLayout>
 
-    <CheckBox
-        android:id="@+id/check_event_in_calendar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/osmand_parking_add_event" />
+	<CheckBox
+		android:id="@+id/check_event_in_calendar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:checked="true"
+		android:text="@string/osmand_parking_add_event"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoifolder_list.xml b/OsmAnd/res/layout/searchpoifolder_list.xml
index 59198b8bbd..b732cbb2eb 100644
--- a/OsmAnd/res/layout/searchpoifolder_list.xml
+++ b/OsmAnd/res/layout/searchpoifolder_list.xml
@@ -37,5 +37,5 @@
         android:paddingLeft="4dp"
         android:paddingRight="8dp"
         android:paddingTop="2dp"
-        android:src="@android:drawable/ic_input_get" />
+        android:src="@drawable/ic_action_filter_dark" />
 </LinearLayout>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 99bbf05270..93b499b5d4 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -17,82 +17,82 @@
 	<string name="poi_dairy">Малочная крама</string>
 	<string name="poi_vending_machine">Гандлёвы аўтамат</string>
 
-	<string name="poi_bookshop">Кнігарня</string>
-	<string name="poi_bicycle_shop">Крама ровараў</string>
-	<string name="poi_anime_shop">Крама анімэ</string>
-	<string name="poi_antiques_shop">Антыкварыят</string>
-	<string name="poi_art_shop">Творы мастацтва</string>
-	<string name="poi_bag_shop">Торбы, валізкі</string>
+	<string name="poi_books">Кнігарня</string>
+	<string name="poi_bicycle">Крама ровараў</string>
+	<string name="poi_anime">Крама анімэ</string>
+	<string name="poi_antiques">Антыкварыят</string>
+	<string name="poi_art">Творы мастацтва</string>
+	<string name="poi_bag">Торбы, валізкі</string>
 	<string name="poi_military_naval_base">Ваенна-марская база</string>
 	<string name="poi_military_nuclear_explosion_site">Месца ядзернага выбуху</string>
-<string name="poi_mine_historic">Гістарычная шахта</string>
-	<string name="poi_carpet_shop">Крама дываноў</string>
+<string name="poi_historic_mine">Гістарычная шахта</string>
+	<string name="poi_carpet">Крама дываноў</string>
 	<string name="poi_florist">Кветі</string>
-	<string name="poi_furniture_shop">Мэбля</string>
+	<string name="poi_furniture">Мэбля</string>
 	<string name="poi_garden_centre">Сад і агарод</string>
-	<string name="poi_gas_shop">Газ у балонах</string>
-	<string name="poi_general_shop">Крама</string>
-	<string name="poi_gift_shop">Падарункі, сувеніры</string>
+	<string name="poi_gas">Газ у балонах</string>
+	<string name="poi_general">Крама</string>
+	<string name="poi_gift">Падарункі, сувеніры</string>
 	<string name="poi_baby_goods">Тавары для дзяцей</string>
-	<string name="poi_bathroom_furnishing_shop">Сантэхніка, ванныя</string>
-	<string name="poi_bed_shop">Усё для спальні</string>
+	<string name="poi_bathroom_furnishing">Сантэхніка, ванныя</string>
+	<string name="poi_bed">Усё для спальні</string>
 	<string name="poi_boutique">Буцік</string>
-	<string name="poi_chemist_shop">Аптэка</string>
-	<string name="poi_clothes_shop">Крама адзеньня</string>
-	<string name="poi_children_clothes_shop">Дзіцячае адзеньне</string>
+	<string name="poi_chemist">Аптэка</string>
+	<string name="poi_clothes">Крама адзеньня</string>
+	<string name="poi_children_clothes">Дзіцячае адзеньне</string>
 	<string name="poi_shoes">Крама абутку</string>
-	<string name="poi_computer_shop">Кампутары</string>
+	<string name="poi_computer">Кампутары</string>
 	<string name="poi_copyshop">Капіявальныя паслугі</string>
-	<string name="poi_curtain_shop">Салон штор</string>
-	<string name="poi_fabric_shop">Тканіны</string>
-	<string name="poi_bedding_shop">Пасьцельная бялізна</string>
-	<string name="poi_dive_shop">Абсталяваньне для дайвінгу</string>
-	<string name="poi_doityourself_shop">Інструмэнты і будматэрыялы</string>
-	<string name="poi_erotic_shop">Сэкс-шоп</string>
-	<string name="poi_fishing_shop">Рыбалоўная крама</string>
-	<string name="poi_frame_shop">Рамкі, багет</string>
-	<string name="poi_glaziery_shop">Вокны, шкло</string>
-	<string name="poi_hardware_shop">Будаўнічая крама</string>
-	<string name="poi_hearing_aids_shop">Слыхавыя апараты</string>
+	<string name="poi_curtain">Салон штор</string>
+	<string name="poi_fabric">Тканіны</string>
+	<string name="poi_bedding">Пасьцельная бялізна</string>
+	<string name="poi_dive">Абсталяваньне для дайвінгу</string>
+	<string name="poi_doityourself">Інструмэнты і будматэрыялы</string>
+	<string name="poi_erotic">Сэкс-шоп</string>
+	<string name="poi_fishing">Рыбалоўная крама</string>
+	<string name="poi_frame">Рамкі, багет</string>
+	<string name="poi_glaziery">Вокны, шкло</string>
+	<string name="poi_hardware">Будаўнічая крама</string>
+	<string name="poi_hearing_aids">Слыхавыя апараты</string>
 	<string name="poi_herbalist">Травы</string>
-	<string name="poi_hifi_shop">Hi-Fi апаратура</string>
-	<string name="poi_houseware_shop">Гаспадарчыя тавары</string>
-	<string name="poi_hunting_shop">Паляўнічая крама</string>
-	<string name="poi_interior_decoration_shop">Дэкор і афармленьне</string>
-	<string name="poi_jewelry_shop">Ювелірная крама</string>
+	<string name="poi_hifi">Hi-Fi апаратура</string>
+	<string name="poi_houseware">Гаспадарчыя тавары</string>
+	<string name="poi_hunting">Паляўнічая крама</string>
+	<string name="poi_interior_decoration">Дэкор і афармленьне</string>
+	<string name="poi_jewelry">Ювелірная крама</string>
 	<string name="poi_kiosk">Кіёск</string>
-	<string name="poi_kitchen_shop">Кухонная мэбля</string>
-	<string name="poi_mobile_phone_shop">Мабільныя тэлефоны</string>
-	<string name="poi_motorcycle_shop">Матацыклы</string>
-	<string name="poi_musical_instrument_shop">Музычныя інструмэнты</string>
-	<string name="poi_newsagent_shop">Газэты і часопісы</string>
+	<string name="poi_kitchen">Кухонная мэбля</string>
+	<string name="poi_mobile_phone">Мабільныя тэлефоны</string>
+	<string name="poi_motorcycle">Матацыклы</string>
+	<string name="poi_musical_instrument">Музычныя інструмэнты</string>
+	<string name="poi_newsagent">Газэты і часопісы</string>
 	<string name="poi_optician_shop">Акуліст</string>
-	<string name="poi_organic_shop">Арганічныя прадукты харчаваньня</string>
-	<string name="poi_outdoor_shop">Тавары для актыўнага адпачынку</string>
-	<string name="poi_paint_shop">Фарбы</string>
-	<string name="poi_pet_shop">Тавары для жывёл</string>
-	<string name="poi_radiotechnics_shop">Радыёдэталі</string>
+	<string name="poi_organic">Арганічныя прадукты харчаваньня</string>
+	<string name="poi_outdoor">Тавары для актыўнага адпачынку</string>
+	<string name="poi_paint">Фарбы</string>
+	<string name="poi_pet">Тавары для жывёл</string>
+	<string name="poi_radiotechnics">Радыёдэталі</string>
 	<string name="poi_second_hand">Сэканд-хэнд</string>
 	<string name="poi_ship_chandler">Яхты, запчасткі, абсталяваньне</string>
-	<string name="poi_sports_shop">Спорттавары</string>
-	<string name="poi_stationery_shop">Канцылярскія тавары</string>
-	<string name="poi_tableware_shop">Посуд</string>
-	<string name="poi_ticket_shop">Продаж квіткоў</string>
-	<string name="poi_tobacco_shop">Тытунь</string>
-	<string name="poi_toys_shop">Цацкі</string>
-	<string name="poi_trade_shop">Аптовы склад</string>
-	<string name="poi_vacuum_cleaner_shop">Пыласосы і аксэсуары</string>
+	<string name="poi_sports">Спорттавары</string>
+	<string name="poi_stationery">Канцылярскія тавары</string>
+	<string name="poi_tableware">Посуд</string>
+	<string name="poi_ticket">Продаж квіткоў</string>
+	<string name="poi_tobacco">Тытунь</string>
+	<string name="poi_toys">Цацкі</string>
+	<string name="poi_trade">Аптовы склад</string>
+	<string name="poi_vacuum_cleaner">Пыласосы і аксэсуары</string>
 	<string name="poi_variety_store">Усё па адным кошце</string>
-	<string name="poi_video_shop">Продаж, пракат DVD</string>
-	<string name="poi_window_blind_shop">Жалюзі, аканіцы, маркізы</string>
+	<string name="poi_video">Продаж, пракат DVD</string>
+	<string name="poi_window_blind">Жалюзі, аканіцы, маркізы</string>
 	<string name="poi_department_store">Універмаг</string>
-	<string name="poi_electronics_shop">Электроніка</string>
+	<string name="poi_electronics">Электроніка</string>
 	<string name="poi_car_shop">Аўтасалон</string>
 	<string name="poi_car_parts_shop">Аўтазапчасткі</string>
-	<string name="poi_atv_shop">Квадрацыклы</string>
-	<string name="poi_cosmetics_shop">Касметыка, парфумерыя</string>
+	<string name="poi_atv">Квадрацыклы</string>
+	<string name="poi_cosmetics">Касметыка, парфумерыя</string>
 	<string name="poi_marketplace">Рынак</string>
-	<string name="poi_sewing_shop">Галантарэя</string>
+	<string name="poi_sewing">Галантарэя</string>
 
 	<string name="poi_police">Міліцыя/Паліцыя</string>
 	<string name="poi_fire_station">Пажарная частка</string>
@@ -148,7 +148,7 @@
 	<string name="poi_railway_station">Чыгуначная станцыя</string>
 	<string name="poi_railway_platform">Чыгуначная плятформа</string>
 	<string name="poi_railway_halt">Чыгуначная плятформа (састар.)</string>
-	<string name="poi_subway_entrance">Уваход у мэтро</string>
+	<string name="poi_railway_subway_entrance">Уваход у мэтро</string>
 	<string name="poi_subway_station">Станцыя мэтро</string>
 	<string name="poi_taxi">Стаянка таксі</string>
 
@@ -245,7 +245,7 @@
 	<string name="poi_pension_fund">Пэнсійны фонд</string>
 	<string name="poi_migration">Міграцыйная служба</string>
 	<string name="poi_tax_inspection">Падатковая</string>
-	<string name="poi_administrative_office">Адміністрацыйная ўстанова</string>
+	<string name="poi_office_administrative">Адміністрацыйная ўстанова</string>
 	<string name="poi_customs">Мытны пункт</string>
 	<string name="poi_city">Горад</string>
 	<string name="poi_town">Мястэчка</string>
@@ -284,14 +284,14 @@
 	<string name="poi_insurance">Страхавая кампанія</string>
 	<string name="poi_estate_agent">Агенцтва нерухомасьці</string>
 	<string name="poi_lawyer">Юрыдычныя паслугі</string>
-	<string name="poi_telecommunication_office">Тэлекамунікацыйная кампанія</string>
+	<string name="poi_office_telecommunication">Тэлекамунікацыйная кампанія</string>
 	<string name="poi_ngo">Грамадзкая арганізацыя</string>
 	<string name="poi_town_hall">Адміністрацыя населенага пункта</string>
 	<string name="poi_employment_agency">Біржа працы</string>
-	<string name="poi_research_office">Дасьледчы цэнтар</string>
-	<string name="poi_it_office">Інфармацыйныя тэхналёгіі</string>
-	<string name="poi_newspaper_office">Друкаванае выданьне</string>
-	<string name="poi_architect_office">Архітэктура, офіс</string>
+	<string name="poi_research">Дасьледчы цэнтар</string>
+	<string name="poi_it">Інфармацыйныя тэхналёгіі</string>
+	<string name="poi_newspaper">Друкаванае выданьне</string>
+	<string name="poi_architect">Архітэктура, офіс</string>
 	<string name="poi_advertising_agency">Рэкламнае агенцтва</string>
 	<string name="poi_educational_institution">Адукацыйная ўстанова (адміністрацыя)</string>
 	<string name="poi_studio">Студыя гукапісу, тэлестудыя</string>
@@ -373,16 +373,16 @@
 	<string name="poi_city_gate">Гарадзкая брама</string>
 	<string name="poi_fort">Фартыфікацыйныя збудаваньні</string>
 	<string name="poi_fountain">Фантан</string>
-	<string name="poi_ruins_historic">Гістарычныя руіны</string>
+	<string name="poi_historic_ruins">Гістарычныя руіны</string>
 	<string name="poi_rune_stone">Руніцкі камень</string>
 	<string name="poi_wreck">Месца караблекрушэньня</string>
-	<string name="poi_ship_historic">Судна (музэй)</string>
+	<string name="poi_historic_ship">Судна (музэй)</string>
 	<string name="poi_monument">Манумэнт (помнік)</string>
 	<string name="poi_zoo">Заапарк</string>
 	<string name="poi_theme_park">Парк забаў</string>
 	
 	<string name="poi_attraction">Выбітнасьць</string>
-	<string name="poi_ferris_wheel">Кола агляду</string>
+	<string name="poi_big_wheel">Кола агляду</string>
 	<string name="poi_carousel">Карусэль</string>
 	<string name="poi_maze">Лябірынт</string>
 	<string name="poi_swing_carousel">Арэлі-карусэлі</string>
@@ -397,19 +397,19 @@
 	<string name="poi_chalet">Шале</string>
 
 	<string name="poi_place_of_worship">Месца пакланеньня</string>
-	<string name="poi_place_of_worship_christian">Храм, царква (капліца)</string>
-	<string name="poi_place_of_worship_jewish">Сынагога</string>
-	<string name="poi_place_of_worship_muslim">Мячэт</string>
-	<string name="poi_place_of_worship_sikh">Месца пакланеньня: сыкхізм</string>
-	<string name="poi_place_of_worship_buddhist">Месца пакланеньня: будызм</string>
-	<string name="poi_place_of_worship_hindu">Месца пакланеньня: індуізм</string>
-	<string name="poi_place_of_worship_shinto">Месца пакланеньня: сінтаізм</string>
-	<string name="poi_place_of_worship_taoist">Месца пакланеньня: даасізм</string>
+	<string name="poi_religion_christian">Храм, царква (капліца)</string>
+	<string name="poi_religion_jewish">Сынагога</string>
+	<string name="poi_religion_muslim">Мячэт</string>
+	<string name="poi_religion_sikh">Месца пакланеньня: сыкхізм</string>
+	<string name="poi_religion_buddhist">Месца пакланеньня: будызм</string>
+	<string name="poi_religion_hindu">Месца пакланеньня: індуізм</string>
+	<string name="poi_religion_shinto">Месца пакланеньня: сінтаізм</string>
+	<string name="poi_religion_taoist">Месца пакланеньня: даасізм</string>
 	<string name="poi_monastery">Кляштар</string>
 	<string name="poi_historic_monastery">Гістарычны кляштар</string>
 	<string name="poi_wayside_cross">Прыдарожны крыж</string>
 	<string name="poi_wayside_shrine">Прыдарожная сьвятыня</string>
-	<string name="poi_tourism_information">Інфармацыйны стэнд</string>
+	<string name="poi_information">Інфармацыйны стэнд</string>
 	<string name="poi_clock">Гадзіньнік</string>
 	<string name="poi_travel_agent">Турагент</string>
 	<string name="poi_viewpoint">Месца з добрым відам</string>
@@ -463,7 +463,7 @@
 	<string name="poi_stripclub">Стрыпклюб</string>
 	<string name="poi_beach_resort">Пляжны комплекс</string>
 	<string name="poi_dog_park">Пляцоўка для выгулу сабак</string>
-	<string name="poi_fishing_place">Месца для рыбалкі</string>
+	<string name="poi_leisure_fishing">Месца для рыбалкі</string>
 	<string name="poi_hunting_stand">Паляўнічая вышка</string>
 	<string name="poi_harbour">Гавань</string>
 	<string name="poi_marina">Прыстань, яхт-клуб</string>
@@ -483,58 +483,58 @@
 	<string name="poi_drinking_water">Пітная вада</string>
 	<string name="poi_barbecue">Ўстаноўка для барбекю</string>
 
-	<string name="poi_agricultural_engines_craft">Рамонт с/г тэхнікі</string>
-	<string name="poi_basket_maker">Пляценьне з лазы</string>
-	<string name="poi_beekeeper">Пчаляр</string>
-	<string name="poi_blacksmith">Гамарня</string>
-	<string name="poi_brewery">Бровар</string>
-	<string name="poi_boatbuilder">Верф</string>
-	<string name="poi_bookbinder">Пераплётная майстэрня</string>
-	<string name="poi_carpenter">Сталярная майстэрня</string>
-	<string name="poi_carpet_layer">Укладка дываноў, каўраліна</string>
-	<string name="poi_caterer">Кэйтэрынг</string>
-	<string name="poi_clockmaker">Гадзіньнікавая майстэрня</string>
-	<string name="poi_dressmaker">Пашыў, рамонт адзежы</string>
-	<string name="poi_electrician">Электрык</string>
-	<string name="poi_gardener">Садоўнік, ландшафтны дызайнер</string>
-	<string name="poi_glaziery_craft">Шклорэзная майстэрня</string>
-	<string name="poi_handicraft">Рукадзельле, упрыгожваньні</string>
-	<string name="poi_hvac">Мантаж кандыцыянераў, сыстэм вэнтыляцыі</string>
-	<string name="poi_insulation_craft">Паслугі па ўцяпленьні памяшканьняў</string>
-	<string name="poi_jeweller">Ювелірная майстэрня</string>
-	<string name="poi_locksmith">Слясарныя працы</string>
-	<string name="poi_key_cutter">Выраб ключоў</string>
-	<string name="poi_metal_construction_craft">Мэталаканструкцыі</string>
-	<string name="poi_optician">Оптык</string>
-	<string name="poi_painter">Маляр</string>
-	<string name="poi_parquet_layer">Паркетныя працы</string>
-	<string name="poi_photographer">Фатограф</string>
-	<string name="poi_photographic_laboratory">Фоталябараторыя</string>
-	<string name="poi_plasterer">Тынковачныя працы</string>
-	<string name="poi_plumber">Сантэхнік</string>
-	<string name="poi_pottery_craft">Ганчарная майстэрня</string>
-	<string name="poi_rigger">Абсталяваньне для яхт, катэраў</string>
-	<string name="poi_roofer">Страхар</string>
-	<string name="poi_saddler">Пашыў і рамонт аўтакрэслаў</string>
-	<string name="poi_sailmaker">Пашыў і рамонт ветразяў</string>
-	<string name="poi_sawmill">Піларама</string>
-	<string name="poi_scaffolder">Узвядзеньне будаўнічых лясоў</string>
-	<string name="poi_sculptor">Скульптар</string>
-	<string name="poi_shoemaker">Абутковая майстэрня</string>
-	<string name="poi_stand_builder">Выраб выставачных стэндаў</string>
-	<string name="poi_stonemason">Каменярэзная майстэрня</string>
-	<string name="poi_sun_protection_craft">Выраб падстрэшкаў, жалюзі</string>
-	<string name="poi_sweep">Камінар</string>
-	<string name="poi_tailor">Атэлье</string>
-	<string name="poi_tiler">Пліткавыя працы</string>
-	<string name="poi_tinsmith">Бляхар, лудзільшчык</string>
-	<string name="poi_upholsterer">Драпавальшчык, абіўка мэблі</string>
-	<string name="poi_watchmaker">Гадзіннікавы майстар</string>
-	<string name="poi_window_construction">Выраб вокнаў</string>
+	<string name="poi_craft_agricultural_engines">Рамонт с/г тэхнікі</string>
+	<string name="poi_craft_basket_maker">Пляценьне з лазы</string>
+	<string name="poi_craft_beekeeper">Пчаляр</string>
+	<string name="poi_craft_blacksmith">Гамарня</string>
+	<string name="poi_craft_brewery">Бровар</string>
+	<string name="poi_craft_boatbuilder">Верф</string>
+	<string name="poi_craft_bookbinder">Пераплётная майстэрня</string>
+	<string name="poi_craft_carpenter">Сталярная майстэрня</string>
+	<string name="poi_craft_carpet_layer">Укладка дываноў, каўраліна</string>
+	<string name="poi_craft_caterer">Кэйтэрынг</string>
+	<string name="poi_craft_clockmaker">Гадзіньнікавая майстэрня</string>
+	<string name="poi_craft_dressmaker">Пашыў, рамонт адзежы</string>
+	<string name="poi_craft_electrician">Электрык</string>
+	<string name="poi_craft_gardener">Садоўнік, ландшафтны дызайнер</string>
+	<string name="poi_craft_glaziery">Шклорэзная майстэрня</string>
+	<string name="poi_craft_handicraft">Рукадзельле, упрыгожваньні</string>
+	<string name="poi_craft_hvac">Мантаж кандыцыянераў, сыстэм вэнтыляцыі</string>
+	<string name="poi_craft_insulation">Паслугі па ўцяпленьні памяшканьняў</string>
+	<string name="poi_craft_jeweller">Ювелірная майстэрня</string>
+	<string name="poi_craft_locksmith">Слясарныя працы</string>
+	<string name="poi_craft_key_cutter">Выраб ключоў</string>
+	<string name="poi_craft_metal_construction">Мэталаканструкцыі</string>
+	<string name="poi_craft_optician">Оптык</string>
+	<string name="poi_craft_painter">Маляр</string>
+	<string name="poi_craft_parquet_layer">Паркетныя працы</string>
+	<string name="poi_craft_photographer">Фатограф</string>
+	<string name="poi_craft_photographic_laboratory">Фоталябараторыя</string>
+	<string name="poi_craft_plasterer">Тынковачныя працы</string>
+	<string name="poi_craft_plumber">Сантэхнік</string>
+	<string name="poi_craft_pottery">Ганчарная майстэрня</string>
+	<string name="poi_craft_rigger">Абсталяваньне для яхт, катэраў</string>
+	<string name="poi_craft_roofer">Страхар</string>
+	<string name="poi_craft_saddler">Пашыў і рамонт аўтакрэслаў</string>
+	<string name="poi_craft_sailmaker">Пашыў і рамонт ветразяў</string>
+	<string name="poi_craft_sawmill">Піларама</string>
+	<string name="poi_craft_scaffolder">Узвядзеньне будаўнічых лясоў</string>
+	<string name="poi_craft_sculptor">Скульптар</string>
+	<string name="poi_craft_shoemaker">Абутковая майстэрня</string>
+	<string name="poi_craft_stand_builder">Выраб выставачных стэндаў</string>
+	<string name="poi_craft_stonemason">Каменярэзная майстэрня</string>
+	<string name="poi_craft_sun_protection">Выраб падстрэшкаў, жалюзі</string>
+	<string name="poi_craft_sweep">Камінар</string>
+	<string name="poi_craft_tailor">Атэлье</string>
+	<string name="poi_craft_tiler">Пліткавыя працы</string>
+	<string name="poi_craft_tinsmith">Бляхар, лудзільшчык</string>
+	<string name="poi_craft_upholsterer">Драпавальшчык, абіўка мэблі</string>
+	<string name="poi_craft_watchmaker">Гадзіннікавы майстар</string>
+	<string name="poi_craft_window_construction">Выраб вокнаў</string>
 
 	<string name="poi_funeral_directors">Рытуальныя паслугі</string>
-	<string name="poi_computer_craft">Зборка кампутараў</string>
-	<string name="poi_beauty_salon">Салон прыгажосьці</string>
+	<string name="poi_craft_computer">Зборка кампутараў</string>
+	<string name="poi_beauty">Салон прыгажосьці</string>
 	<string name="poi_beauty_salon_nails">Манікюрны салён</string>
 	<string name="poi_hairdresser">Цырульня</string>
 	<string name="poi_massage">Масажны салён</string>
@@ -557,7 +557,7 @@
 	<string name="poi_pawnbroker">Лямбард</string>
 	<string name="poi_currencyexchange">Абмен валют</string>
 	<string name="poi_accountant">Бухгалтарскія паслугі</string>
-	<string name="poi_bitcoin_yes">Аплата bitcoin</string>
+	<string name="poi_bitcoin">Аплата bitcoin</string>
 
 	<string name="poi_cave_entrance">Уваход у пячору</string>
 	<string name="poi_peak">Горная вяршыня</string>
@@ -668,7 +668,7 @@
 	<string name="poi_man_made">Антрапагеннае</string>
 	<string name="poi_apartment">Апартамэнты</string>
 
-	<string name="poi_child_clothes_shop">Дзіцячае адзеньне</string>
+	<string name="poi_child_clothes">Дзіцячае адзеньне</string>
 	<string name="poi_wine">Вінная крама</string>
 
 	<string name="poi_car_parts">Аўтазапчасткі</string>
@@ -683,6 +683,5 @@
 	<string name="poi_farm">Фермэрская крама</string>
 	<string name="poi_car">Аўтакрама</string>
 	<string name="poi_lodging">Начлег</string>
-	<string name="poi_general">Сельская крама</string>
 	<string name="poi_railway_buffer_stop">Чыгуначны тупіковы ўпор</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index e8818e3b91..3e6a6c430d 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -8,19 +8,19 @@
 	<string name="poi_butcher">Carnisseria</string>
 	<string name="poi_seafood">Peixateria</string>
 	<string name="poi_supermarket">Supermercat</string>
-	<string name="poi_bookshop">Llibreria</string>
-	<string name="poi_antiques_shop">Antiquari</string>
-	<string name="poi_art_shop">Galeria d\'art</string>
-	<string name="poi_chemist_shop">Drogueria</string>
+	<string name="poi_books">Llibreria</string>
+	<string name="poi_antiques">Antiquari</string>
+	<string name="poi_art">Galeria d\'art</string>
+	<string name="poi_chemist">Drogueria</string>
 	<string name="poi_shoes">Sabateria</string>
 	<string name="poi_florist">Floristeria</string>
 	<string name="poi_garden_centre">Centre de jardineria</string>
-	<string name="poi_gift_shop">Botiga de regals</string>
-	<string name="poi_glaziery_shop">Vidrieria</string>
-	<string name="poi_hardware_shop">Ferreteria</string>
+	<string name="poi_gift">Botiga de regals</string>
+	<string name="poi_glaziery">Vidrieria</string>
+	<string name="poi_hardware">Ferreteria</string>
 	<string name="poi_herbalist">Herbolari</string>
-	<string name="poi_interior_decoration_shop">Botiga d\'interiorisme</string>
-	<string name="poi_jewelry_shop">Joieria</string>
+	<string name="poi_interior_decoration">Botiga d\'interiorisme</string>
+	<string name="poi_jewelry">Joieria</string>
 	<string name="poi_kiosk">Quiosc</string>
 	<string name="poi_optician_shop">Optometria</string>
 	<string name="poi_convenience">Botiga de queviures</string>
@@ -33,29 +33,29 @@
 	<string name="poi_dairy">Productes làctics</string>
 	<string name="poi_vending_machine">Màquina expenedora</string>
 
-	<string name="poi_bicycle_shop">Taller de bicicletes</string>
-	<string name="poi_anime_shop">Botiga d\'anime</string>
+	<string name="poi_bicycle">Taller de bicicletes</string>
+	<string name="poi_anime">Botiga d\'anime</string>
 	<string name="poi_baby_goods">Articles per a bebès</string>
-	<string name="poi_bathroom_furnishing_shop">Mobles de bany</string>
-	<string name="poi_bed_shop">Matalasseria</string>
+	<string name="poi_bathroom_furnishing">Mobles de bany</string>
+	<string name="poi_bed">Matalasseria</string>
 	<string name="poi_boutique">Boutique</string>
-	<string name="poi_computer_shop">Botiga d\'informàtica</string>
+	<string name="poi_computer">Botiga d\'informàtica</string>
 	<string name="poi_copyshop">Copisteria</string>
-	<string name="poi_dive_shop">Equipament per submarinisme</string>
-	<string name="poi_doityourself_shop">Botiga de bricolatge</string>
-	<string name="poi_erotic_shop">Articles eròtics</string>
-	<string name="poi_fishing_shop">Estris de pesca</string>
-	<string name="poi_frame_shop">Serveis d\'emmarcament</string>
-	<string name="poi_furniture_shop">Botiga de mobles</string>
-	<string name="poi_hearing_aids_shop">Audiòfons</string>
-	<string name="poi_hifi_shop">Equips d\'alta fidelitat</string>
-	<string name="poi_hunting_shop">Equipament de caça</string>
-	<string name="poi_mobile_phone_shop">Botiga de telèfons mòbils</string>
-	<string name="poi_motorcycle_shop">Botiga de motocicletes</string>
-	<string name="poi_musical_instrument_shop">Instruments musicals</string>
-	<string name="poi_newsagent_shop">Premsa</string>
+	<string name="poi_dive">Equipament per submarinisme</string>
+	<string name="poi_doityourself">Botiga de bricolatge</string>
+	<string name="poi_erotic">Articles eròtics</string>
+	<string name="poi_fishing">Estris de pesca</string>
+	<string name="poi_frame">Serveis d\'emmarcament</string>
+	<string name="poi_furniture">Botiga de mobles</string>
+	<string name="poi_hearing_aids">Audiòfons</string>
+	<string name="poi_hifi">Equips d\'alta fidelitat</string>
+	<string name="poi_hunting">Equipament de caça</string>
+	<string name="poi_mobile_phone">Botiga de telèfons mòbils</string>
+	<string name="poi_motorcycle">Botiga de motocicletes</string>
+	<string name="poi_musical_instrument">Instruments musicals</string>
+	<string name="poi_newsagent">Premsa</string>
 	<string name="poi_second_hand">Botiga de segona mà</string>
-	<string name="poi_electronics_shop">Botiga d\'electrodomèstics</string>
+	<string name="poi_electronics">Botiga d\'electrodomèstics</string>
 	<string name="poi_police">Policia</string>
 	<string name="poi_fire_station">Parc de bombers</string>
 	<string name="poi_emergency_phone">Telèfon d\'emergència</string>
@@ -74,17 +74,17 @@
 	<string name="poi_military_bunker">Búnquer militar</string>
 	<string name="poi_military_barracks">Barracons militars</string>
 	<string name="poi_military_danger_area">Zona de tir</string>
-	<string name="poi_organic_shop">Menjar ecològic</string>
-	<string name="poi_paint_shop">Pintures</string>
-	<string name="poi_pet_shop">Botiga d\'animals</string>
-	<string name="poi_radiotechnics_shop">Radiotècnia</string>
-	<string name="poi_sports_shop">Material esportiu</string>
-	<string name="poi_ticket_shop">Taquilla</string>
+	<string name="poi_organic">Menjar ecològic</string>
+	<string name="poi_paint">Pintures</string>
+	<string name="poi_pet">Botiga d\'animals</string>
+	<string name="poi_radiotechnics">Radiotècnia</string>
+	<string name="poi_sports">Material esportiu</string>
+	<string name="poi_ticket">Taquilla</string>
 	<string name="poi_seamark_harbour">Port</string>
 	<string name="poi_seamark_fog_signal">Botzina de boira</string>
-	<string name="poi_cosmetics_shop">Cosmètica</string>
+	<string name="poi_cosmetics">Cosmètica</string>
 	<string name="poi_marketplace">Mercat</string>
-	<string name="poi_sewing_shop">Merceria</string>
+	<string name="poi_sewing">Merceria</string>
 
 	<string name="poi_ses_station">Estació de protecció civil</string>
 	<string name="poi_ford">Gual</string>
@@ -110,20 +110,20 @@
 	<string name="poi_public_transport_platform_tram">Parada de tramvia</string>
 	<string name="poi_tram_stop">Parada de tramvia (obsolet)</string>
 	<string name="poi_public_transport_station">Estació de transport públic</string>
-	<string name="poi_mine_historic">Mina històrica</string>
+	<string name="poi_historic_mine">Mina històrica</string>
 	<string name="poi_gate">Porta</string>
-	<string name="poi_tobacco_shop">Venda de tabac</string>
-	<string name="poi_carpet_shop">Botiga de catifes</string>
-	<string name="poi_clothes_shop">Magatzem de roba</string>
-	<string name="poi_children_clothes_shop">Roba infantil</string>
-	<string name="poi_curtain_shop">Pelleteria</string>
-	<string name="poi_fabric_shop">Botiga de teixits</string>
+	<string name="poi_tobacco">Venda de tabac</string>
+	<string name="poi_carpet">Botiga de catifes</string>
+	<string name="poi_clothes">Magatzem de roba</string>
+	<string name="poi_children_clothes">Roba infantil</string>
+	<string name="poi_curtain">Pelleteria</string>
+	<string name="poi_fabric">Botiga de teixits</string>
 	<string name="poi_public_transport_platform">Parada de transport públic</string>
 	<string name="poi_bus_station">Estació d\'autobús (obsolet)</string>
 	<string name="poi_railway_station">Estació de tren (obsolet)</string>
 	<string name="poi_railway_platform">Andana de tren (obsolet)</string>
 	<string name="poi_railway_halt">Parada de tren (obsolet)</string>
-	<string name="poi_subway_entrance">Entrada de metro</string>
+	<string name="poi_railway_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estació de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
 
@@ -136,14 +136,14 @@
 	<string name="poi_bicycle_rental">Lloguer de bicicletes</string>
 	<string name="poi_bicycle_parking">Aparcament per bicicletes</string>
 
-	<string name="poi_houseware_shop">Complements per la llar</string>
-	<string name="poi_stationery_shop">Papereria</string>
-	<string name="poi_tableware_shop">Botiga de vaixelles</string>
-	<string name="poi_toys_shop">Botiga de joguines</string>
-	<string name="poi_trade_shop">Materials de construcció</string>
+	<string name="poi_houseware">Complements per la llar</string>
+	<string name="poi_stationery">Papereria</string>
+	<string name="poi_tableware">Botiga de vaixelles</string>
+	<string name="poi_toys">Botiga de joguines</string>
+	<string name="poi_trade">Materials de construcció</string>
 	<string name="poi_variety_store">Botiga de descompte</string>
-	<string name="poi_video_shop">Videoclub</string>
-	<string name="poi_window_blind_shop">Botiga de persianes</string>
+	<string name="poi_video">Videoclub</string>
+	<string name="poi_window_blind">Botiga de persianes</string>
 	<string name="poi_ferry_terminal">Terminal de ferri</string>
 	<string name="poi_aerialway_cable_car">Telefèric</string>
 	<string name="poi_aerialway_station">Estació de remuntador</string>
@@ -153,7 +153,7 @@
 	<string name="poi_tunnel">Túnel</string>
 	<string name="poi_bridge">Pont</string>
 
-	<string name="poi_vacuum_cleaner_shop">Aspiradores i aparells de neteja</string>
+	<string name="poi_vacuum_cleaner">Aspiradores i aparells de neteja</string>
 	<string name="poi_motorway_junction">Creuament d\'autopistes</string>
 
 	<string name="poi_water_well">Pou d\'aigua</string>
@@ -247,13 +247,13 @@
 	<string name="poi_insurance">Agència d\'assegurances</string>
 	<string name="poi_estate_agent">Immobiliària</string>
 	<string name="poi_lawyer">Gabinet d\'advocats</string>
-	<string name="poi_telecommunication_office">Empresa de telecomunicacions</string>
+	<string name="poi_office_telecommunication">Empresa de telecomunicacions</string>
 	<string name="poi_ngo">ONG</string>
 	<string name="poi_town_hall">Ajuntament</string>
 	<string name="poi_employment_agency">Oficina d\'ocupació</string>
-	<string name="poi_research_office">Oficina de recerca i desenvolupament</string>
-	<string name="poi_it_office">Consultoria en TIC</string>
-	<string name="poi_architect_office">Gabinet d\'arquitectura</string>
+	<string name="poi_research">Oficina de recerca i desenvolupament</string>
+	<string name="poi_it">Consultoria en TIC</string>
+	<string name="poi_architect">Gabinet d\'arquitectura</string>
 	<string name="poi_advertising_agency">Agència de publicitat</string>
 	<string name="poi_studio">Estudi de gravació, ràdio o TV</string>
 	<string name="poi_bookmaker">Casa d\'apostes</string>
@@ -302,8 +302,8 @@
 	<string name="poi_paddle_tennis">Pàdel</string>
 	<string name="poi_paragliding">Parapent</string>
 	<string name="poi_pelota">Joc de pilota</string>
-	<string name="poi_bedding_shop">Matalasseria</string>
-	<string name="poi_gas_shop">Gas liquat</string>
+	<string name="poi_bedding">Matalasseria</string>
+	<string name="poi_gas">Gas liquat</string>
 	<string name="poi_department_store">Gran magatzem</string>
 	<string name="poi_car_parts_shop">Recanvis d\'automòbil</string>
 	<string name="poi_fire_water_pond">Punt d\'aigua per incendis</string>
@@ -356,8 +356,8 @@
 	<string name="poi_battlefield">Antic camp de batalla</string>
 	<string name="poi_city_gate">Porta de la ciutat</string>
 	<string name="poi_fountain">Font ornamental</string>
-	<string name="poi_ruins_historic">Runes històriques</string>
-	<string name="poi_ship_historic">Vaixell històric</string>
+	<string name="poi_historic_ruins">Runes històriques</string>
+	<string name="poi_historic_ship">Vaixell històric</string>
 	<string name="poi_seamark_signal_station_traffic"/>
 	<string name="poi_seamark_dyke">Dic</string>
 	<string name="poi_seamark_floating_dock">Moll flotant</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 155b3047d7..f9306a0301 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
 <string name="map_widget_fluorescent">Rutes amb fluorescència</string>
 <string name="map_widget_show_ruler">Mostra el regle</string>
 <string name="map_widget_transparent">Aparença amb transparència</string>
@@ -60,7 +61,7 @@
 <string name="osmand_parking_pm">PM</string>
 <string name="osmand_parking_am">AM</string>
 <string name="osmand_parking_position_name">Punt d\'aparcament</string>
-<string name="osmand_parking_plugin_description">Connector extern (descàrrega addicional) que permet desar la localització del vostre cotxe aparcat.</string>
+<string name="osmand_parking_plugin_description">Aquest connector s\'ha desenvolupar per utilitzar OsmAnd per desar amb comoditat la localització del vostre cotxe aparcat.</string>
 <string name="osmand_parking_plugin_name">Posició d\'aparcament</string>
 <string name="context_menu_item_add_parking_point">Marca com a posició d\'aparcament</string>
 <string name="context_menu_item_delete_parking_point">Suprimeix un marcador d\'aparcament</string>
@@ -828,7 +829,7 @@
 <string name="opening_hours_not_supported">Format d\'horaris d\'obertura no suportat per a l\'edició</string>
 <string name="transport_to_go_after">prioritza distancia</string>
 <string name="hello">Aplicació de navegació OsmAnd</string>
-<string name="osmand_rastermaps_plugin_description">Us mostra les preferències per configurar diversos mapes en línia o emmagatzemats, com a mapa base o com a mapa sobreposat / de fons. Podeu preparar i copiar aquests mapes a la carpeta de dades OsmAnd.</string>
+<string name="osmand_rastermaps_plugin_description">"Amb aquest connector podeu accedir a diferents tipus de mapa (anomenats mosaic o ràster), des de les tessel·les predefinides d\'OpenStreetMap (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.\n\nQualsevol d\'aquests mapes es pot utilitzar sigui com principal (base) per veure\'s a la vista del mapa de l\'OsmAnd, o com una superposició o sots-posició d\'un altre mapa base (com els mapes  d\'OsmAnd habituals en desconnexió). Per fer més visible qualsevol mapa en sots-posició, es pot amagar fàcilment determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» a voluntat.\n\nEls mapes de tessel·les es poden obtenir directament de proveïdors en línia, o es poden preparar per un ús fora de línia (cal copiar-los manualment al directori de l\'OsmAnd) com una base de dades sqlite construïda per diferents eines de preparació de mapes de tercers. "</string>
 	<string name="choose_audio_stream_descr">Escolliu el canal per reproduir el guiat per veu (depenent del sistema)</string>
 	<string name="renderers">Renderització dels vectors</string>
 	<string name="context_menu_item_open_bug">Obre un error d\'OSM</string>
@@ -1037,7 +1038,7 @@
     <string name="map_widget_distancemeasurement">Mesura de distàncies</string>
     <string name="audionotes_location_not_defined">Encara no teniu definida la localització de la nota. «Usa localització...» per assignar una nota a la localitzacio especificada</string>
     
-    <string name="audionotes_plugin_description">"Mostra el botó de registrar notes d\'àudio/vídeo  durant el viatge"</string>
+    <string name="audionotes_plugin_description">El connector de notes d\'àudio/vídeo permet la funció de registrar notes de so/fotografies/vídeo durant un trajecte, mitjançant un botó a la pantalla o directament pel menú de context de qualsevol punt del mapa.</string>
     <string name="audionotes_plugin_name">Connector de notes d\'àudio</string>
     <string name="index_srtm_parts">peces</string>
     <string name="index_srtm_ele">Línies de nivell</string>
@@ -1205,7 +1206,7 @@
     <string name="osmand_play_title_30_chars">Mapes i navegació OsmAnd</string>
 	<string name="osmand_plus_play_title_30_chars">Mapes i navegació OsmAnd+</string>
 	<string name="transport_stops_to_pass">parades que heu de passar</string>
-	<string name="shared_string_downloading">Baixant …</string>
+	<string name="shared_string_downloading">S\'està baixant</string>
 	<string name="commiting_node">S\'està enviant el node…</string>
 	<string name="choose_intersected_street">Seleccioneu la intersecció</string>
 	<string name="poi_remove_confirm_template">Voleu suprimir {0} (escriviu un comentari)?</string>
@@ -1400,8 +1401,8 @@
     </string>
     <string name="select_gpx">Selecciona una traça GPX…</string>
     <string name="route_descr_select_destination">Selecciona un destí</string>
-    <string name="shared_string_select_on_map">Selecciona al mapa…</string>
-    <string name="shared_string_favorite">Preferida…</string>
+    <string name="shared_string_select_on_map">Seleccioneu al mapa</string>
+    <string name="shared_string_favorite">Preferida</string>
     <string name="route_preferences">Preferències de ruta</string>
     <string name="route_info">Informació de ruta</string>
     <string name="tip_recent_changes_1_3_t">Canvis a la 1.3:
@@ -1899,7 +1900,7 @@
     <string name="shared_string_audio">Àudio</string>
 	
 	
-	<string name="share_note">Comparteix nota</string>
+	<string name="share_note">Comparteix la nota</string>
 	
 	<string name="watch">Mira</string>
 	<string name="notes">Notes</string>
@@ -1917,4 +1918,4 @@ Aquesta vista proporciona,sigui el que sigui el nivell de zoom al mapa, la quant
 No cal baixar un mapa específic, aquesta vista es crea amb els nostres mapes estàndards. 
 
 Aquesta vista es pot desfer tornant a fer la mateixa selecció, o canviant &lt;&lt;Estil del mapa&gt;&gt;  de &lt;&lt;Configuració del mapa&gt;&gt; a com es desitgi. </string>
-	</resources>
\ No newline at end of file
+	</resources>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 358b1aaec7..326d96a899 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -10,36 +10,36 @@
 	<string name="poi_greengrocer">Zelinářství</string>
 	<string name="poi_seafood">Obchod mořskými plody</string>
 	<string name="poi_supermarket">Supermarket</string>
-	<string name="poi_bookshop">Knihkupectví</string>
-	<string name="poi_bicycle_shop"/>
-	<string name="poi_anime_shop"/>
-	<string name="poi_antiques_shop">Starožitnosti</string>
-	<string name="poi_art_shop">Obchod uměním</string>
+	<string name="poi_books">Knihkupectví</string>
+	<string name="poi_bicycle"/>
+	<string name="poi_anime"/>
+	<string name="poi_antiques">Starožitnosti</string>
+	<string name="poi_art">Obchod uměním</string>
 	<string name="poi_baby_goods">Dětské zboží</string>
-	<string name="poi_bag_shop"/>
-	<string name="poi_bathroom_furnishing_shop">Vybavení koupelen</string>
-	<string name="poi_bed_shop">Vybavení ložnic</string>
+	<string name="poi_bag"/>
+	<string name="poi_bathroom_furnishing">Vybavení koupelen</string>
+	<string name="poi_bed">Vybavení ložnic</string>
 	<string name="poi_boutique">Módní butik</string>
-	<string name="poi_carpet_shop"/>
-	<string name="poi_chemist_shop">Drogerie</string>
-	<string name="poi_clothes_shop"/>
-	<string name="poi_children_clothes_shop">Dětské oblečení</string>
+	<string name="poi_carpet"/>
+	<string name="poi_chemist">Drogerie</string>
+	<string name="poi_clothes"/>
+	<string name="poi_children_clothes">Dětské oblečení</string>
 	<string name="poi_shoes">Obuv</string>
-	<string name="poi_computer_shop"/>
+	<string name="poi_computer"/>
 	<string name="poi_copyshop"/>
-	<string name="poi_hardware_shop">Železářství</string>
-	<string name="poi_tobacco_shop">Tabák</string>
-	<string name="poi_dive_shop">Potapěčské vybavení</string>
-	<string name="poi_hunting_shop">Lovecké vybavení</string>
-	<string name="poi_jewelry_shop">Klenotnictví</string>
+	<string name="poi_hardware">Železářství</string>
+	<string name="poi_tobacco">Tabák</string>
+	<string name="poi_dive">Potapěčské vybavení</string>
+	<string name="poi_hunting">Lovecké vybavení</string>
+	<string name="poi_jewelry">Klenotnictví</string>
 	<string name="poi_kiosk">Kiosek</string>
-	<string name="poi_kitchen_shop">Kuchyňské studio</string>
-	<string name="poi_musical_instrument_shop">Hudební nástroje</string>
+	<string name="poi_kitchen">Kuchyňské studio</string>
+	<string name="poi_musical_instrument">Hudební nástroje</string>
 	<string name="poi_optician_shop">Optik</string>
-	<string name="poi_pet_shop">Zverimex</string>
-	<string name="poi_sports_shop">Sportovní vybavení</string>
-	<string name="poi_toys_shop">Hračkářství</string>
-	<string name="poi_cosmetics_shop">Kosmetika</string>
+	<string name="poi_pet">Zverimex</string>
+	<string name="poi_sports">Sportovní vybavení</string>
+	<string name="poi_toys">Hračkářství</string>
+	<string name="poi_cosmetics">Kosmetika</string>
 	<string name="poi_marketplace">Tržiště</string>
 	<string name="poi_police">Policie</string>
 	<string name="poi_fire_station">Hasiči</string>
@@ -153,26 +153,26 @@
 	<string name="poi_drinking_water">Pitná voda</string>
 	<string name="poi_barbecue"/>
 
-	<string name="poi_beekeeper">Včelař</string>
-	<string name="poi_blacksmith">Kovář</string>
-	<string name="poi_brewery">Pivovar</string>
-	<string name="poi_clockmaker">Hodinář</string>
-	<string name="poi_electrician">Elektrikář</string>
-	<string name="poi_gardener">Zahradník</string>
-	<string name="poi_jeweller">Klenotník</string>
-	<string name="poi_locksmith">Zámečník</string>
-	<string name="poi_optician">Optik</string>
-	<string name="poi_painter">Malíř</string>
-	<string name="poi_parquet_layer">Parketář</string>
-	<string name="poi_photographer">Fotograf</string>
-	<string name="poi_plumber">Instalatér</string>
-	<string name="poi_sculptor">Sochař</string>
-	<string name="poi_shoemaker">Obuvník</string>
-	<string name="poi_stonemason">Kameník</string>
-	<string name="poi_tailor">Krejčí</string>
-	<string name="poi_tiler">Pokrývač</string>
-	<string name="poi_tinsmith">Klempíř</string>
-	<string name="poi_beauty_salon">Salón krásy</string>
+	<string name="poi_craft_beekeeper">Včelař</string>
+	<string name="poi_craft_blacksmith">Kovář</string>
+	<string name="poi_craft_brewery">Pivovar</string>
+	<string name="poi_craft_clockmaker">Hodinář</string>
+	<string name="poi_craft_electrician">Elektrikář</string>
+	<string name="poi_craft_gardener">Zahradník</string>
+	<string name="poi_craft_jeweller">Klenotník</string>
+	<string name="poi_craft_locksmith">Zámečník</string>
+	<string name="poi_craft_optician">Optik</string>
+	<string name="poi_craft_painter">Malíř</string>
+	<string name="poi_craft_parquet_layer">Parketář</string>
+	<string name="poi_craft_photographer">Fotograf</string>
+	<string name="poi_craft_plumber">Instalatér</string>
+	<string name="poi_craft_sculptor">Sochař</string>
+	<string name="poi_craft_shoemaker">Obuvník</string>
+	<string name="poi_craft_stonemason">Kameník</string>
+	<string name="poi_craft_tailor">Krejčí</string>
+	<string name="poi_craft_tiler">Pokrývač</string>
+	<string name="poi_craft_tinsmith">Klempíř</string>
+	<string name="poi_beauty">Salón krásy</string>
 	<string name="poi_hairdresser">Kadeřník</string>
 	<string name="poi_tattoo">Tetovací studio</string>
 	<string name="poi_car_rental">Půjčovna aut</string>
@@ -202,21 +202,21 @@
 	<string name="poi_vending_machine">Prodejní automat</string>
 
 	<string name="poi_florist">Květinářství</string>
-	<string name="poi_furniture_shop">Nábytek</string>
+	<string name="poi_furniture">Nábytek</string>
 	<string name="poi_garden_centre">Zahradní centrum</string>
-	<string name="poi_glaziery_shop">Sklenářství</string>
-	<string name="poi_hearing_aids_shop">Sluchové pomůcky</string>
+	<string name="poi_glaziery">Sklenářství</string>
+	<string name="poi_hearing_aids">Sluchové pomůcky</string>
 	<string name="poi_herbalist">Obchod bylinkami</string>
-	<string name="poi_houseware_shop">Domácí potřeby</string>
-	<string name="poi_interior_decoration_shop">Dekorace interiéru</string>
-	<string name="poi_newsagent_shop">Zpravodajská agentura</string>
-	<string name="poi_stationery_shop">Kancelářské potřeby</string>
-	<string name="poi_trade_shop">Obchodní místo</string>
+	<string name="poi_houseware">Domácí potřeby</string>
+	<string name="poi_interior_decoration">Dekorace interiéru</string>
+	<string name="poi_newsagent">Zpravodajská agentura</string>
+	<string name="poi_stationery">Kancelářské potřeby</string>
+	<string name="poi_trade">Obchodní místo</string>
 	<string name="poi_palaeontological_site">Paleontologické naleziště</string>
 
 	<string name="poi_ice_cream">Zmrzlinářství</string>
-	<string name="poi_gas_shop">Obchod tekutým palivem</string>
-	<string name="poi_organic_shop">Organické potraviny</string>
+	<string name="poi_gas">Obchod tekutým palivem</string>
+	<string name="poi_organic">Organické potraviny</string>
 	<string name="poi_second_hand">Second hand</string>
 	<string name="poi_department_store">Obchodní dům</string>
 	<string name="poi_fire_hose">Požární hadice</string>
@@ -230,5 +230,5 @@
 	<string name="poi_vehicle_inspection">Kontrola vozidel</string>
 	<string name="poi_parking_entrance">Vjezd parkoviště</string>
 	<string name="poi_tram_stop">Zastávka tramvaje</string>
-	<string name="poi_mine_historic">Historický důl</string>
+	<string name="poi_historic_mine">Historický důl</string>
 	</resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 4dd1e30f0c..d2f8fe702e 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -17,79 +17,79 @@
         <string name="poi_dairy">Mejeriudsalg</string>
         <string name="poi_vending_machine">Salgsautomat</string>
 
-        <string name="poi_bookshop">Boghandel</string>
-        <string name="poi_bicycle_shop">Cykelhandler</string>
-        <string name="poi_anime_shop">Anime butik</string>
-        <string name="poi_antiques_shop">Antikviteter</string>
-        <string name="poi_art_shop">Kunsthandler</string>
+        <string name="poi_books">Boghandel</string>
+        <string name="poi_bicycle">Cykelhandler</string>
+        <string name="poi_anime">Anime butik</string>
+        <string name="poi_antiques">Antikviteter</string>
+        <string name="poi_art">Kunsthandler</string>
         <string name="poi_baby_goods">Babyudstryr</string>
-        <string name="poi_bag_shop">Taskebutik</string>
-        <string name="poi_bathroom_furnishing_shop">Badeværelsesinventar</string>
-        <string name="poi_bed_shop">Soveværelsesmøbler</string>
+        <string name="poi_bag">Taskebutik</string>
+        <string name="poi_bathroom_furnishing">Badeværelsesinventar</string>
+        <string name="poi_bed">Soveværelsesmøbler</string>
         <string name="poi_boutique">Modebutik</string>
-        <string name="poi_carpet_shop">Tæppeforretning</string>
-        <string name="poi_chemist_shop">Materialist</string>
-        <string name="poi_clothes_shop">Tøjbutik</string>
-        <string name="poi_children_clothes_shop">Børnetøj</string>
+        <string name="poi_carpet">Tæppeforretning</string>
+        <string name="poi_chemist">Materialist</string>
+        <string name="poi_clothes">Tøjbutik</string>
+        <string name="poi_children_clothes">Børnetøj</string>
         <string name="poi_shoes">Skobutik</string>
-        <string name="poi_computer_shop">Computerbutik</string>
+        <string name="poi_computer">Computerbutik</string>
         <string name="poi_copyshop">Kopicenter</string>
-        <string name="poi_curtain_shop">Gardinforretning</string>
-        <string name="poi_fabric_shop">Stofbutik</string>
-        <string name="poi_bedding_shop">Sengetøj</string>
-        <string name="poi_dive_shop">Dykkerudstyr</string>
-        <string name="poi_doityourself_shop">Byggemarked</string>
-        <string name="poi_erotic_shop">Sexshop</string>
-        <string name="poi_fishing_shop">Fiskegrej</string>
+        <string name="poi_curtain">Gardinforretning</string>
+        <string name="poi_fabric">Stofbutik</string>
+        <string name="poi_bedding">Sengetøj</string>
+        <string name="poi_dive">Dykkerudstyr</string>
+        <string name="poi_doityourself">Byggemarked</string>
+        <string name="poi_erotic">Sexshop</string>
+        <string name="poi_fishing">Fiskegrej</string>
         <string name="poi_florist">Blomsterhandler</string>
-        <string name="poi_frame_shop">Rammer</string>
-        <string name="poi_furniture_shop">Møbelforretning</string>
+        <string name="poi_frame">Rammer</string>
+        <string name="poi_furniture">Møbelforretning</string>
         <string name="poi_garden_centre">Havecenter</string>
-        <string name="poi_gas_shop">Flaskegas</string>
-        <string name="poi_general_shop">Landhandel</string>
-        <string name="poi_gift_shop">Gavebutik</string>
-        <string name="poi_glaziery_shop">Glarmester</string>
-        <string name="poi_hardware_shop">Værktøj</string>
-        <string name="poi_hearing_aids_shop">Høreapparater</string>
+        <string name="poi_gas">Flaskegas</string>
+        <string name="poi_general">Landhandel</string>
+        <string name="poi_gift">Gavebutik</string>
+        <string name="poi_glaziery">Glarmester</string>
+        <string name="poi_hardware">Værktøj</string>
+        <string name="poi_hearing_aids">Høreapparater</string>
         <string name="poi_herbalist">Urter</string>
-        <string name="poi_hifi_shop">HiFi butik</string>
-        <string name="poi_houseware_shop">Husholdningsartikler</string>
-        <string name="poi_hunting_shop">Jagtudstyr</string>
-        <string name="poi_interior_decoration_shop">Boligindretning</string>
-        <string name="poi_jewelry_shop">Smykkeforretning</string>
+        <string name="poi_hifi">HiFi butik</string>
+        <string name="poi_houseware">Husholdningsartikler</string>
+        <string name="poi_hunting">Jagtudstyr</string>
+        <string name="poi_interior_decoration">Boligindretning</string>
+        <string name="poi_jewelry">Smykkeforretning</string>
         <string name="poi_kiosk">Kiosk</string>
-        <string name="poi_kitchen_shop">Køkkenudstyr</string>
-        <string name="poi_mobile_phone_shop">Mobiltelefoner</string>
-        <string name="poi_motorcycle_shop">Motorcykler</string>
-        <string name="poi_musical_instrument_shop">Musikinstrumenter</string>
-        <string name="poi_newsagent_shop">Nyhedsbureau</string>
+        <string name="poi_kitchen">Køkkenudstyr</string>
+        <string name="poi_mobile_phone">Mobiltelefoner</string>
+        <string name="poi_motorcycle">Motorcykler</string>
+        <string name="poi_musical_instrument">Musikinstrumenter</string>
+        <string name="poi_newsagent">Nyhedsbureau</string>
         <string name="poi_optician_shop">Optiker</string>
-        <string name="poi_organic_shop">Økologiske fødevarer</string>
-        <string name="poi_outdoor_shop">Friluftsudstyr</string>
-        <string name="poi_paint_shop">Malerværksted</string>
-        <string name="poi_pet_shop">Dyrehandel</string>
-        <string name="poi_radiotechnics_shop">Radioteknik</string>
+        <string name="poi_organic">Økologiske fødevarer</string>
+        <string name="poi_outdoor">Friluftsudstyr</string>
+        <string name="poi_paint">Malerværksted</string>
+        <string name="poi_pet">Dyrehandel</string>
+        <string name="poi_radiotechnics">Radioteknik</string>
         <string name="poi_second_hand">Genbrugsbutik</string>
         <string name="poi_ship_chandler">Skibsproviant</string>
-        <string name="poi_sports_shop">Sportsforretning</string>
-        <string name="poi_stationery_shop">Papirvare</string>
-        <string name="poi_tableware_shop">Isenkræmmer</string>
-        <string name="poi_ticket_shop">Billetter</string>
-        <string name="poi_tobacco_shop">Tobak</string>
-        <string name="poi_toys_shop">Legetøjsbuttik</string>
-        <string name="poi_trade_shop">Handelsplads</string>
-        <string name="poi_vacuum_cleaner_shop">Støvsuger</string>
+        <string name="poi_sports">Sportsforretning</string>
+        <string name="poi_stationery">Papirvare</string>
+        <string name="poi_tableware">Isenkræmmer</string>
+        <string name="poi_ticket">Billetter</string>
+        <string name="poi_tobacco">Tobak</string>
+        <string name="poi_toys">Legetøjsbuttik</string>
+        <string name="poi_trade">Handelsplads</string>
+        <string name="poi_vacuum_cleaner">Støvsuger</string>
         <string name="poi_variety_store">Fastpris butik</string>
-        <string name="poi_video_shop">Video</string>
-        <string name="poi_window_blind_shop">Persienner</string>
+        <string name="poi_video">Video</string>
+        <string name="poi_window_blind">Persienner</string>
         <string name="poi_department_store">Stormagasin</string>
-        <string name="poi_electronics_shop">Elektronik</string>
+        <string name="poi_electronics">Elektronik</string>
         <string name="poi_car_shop">Autohandel</string>
         <string name="poi_car_parts_shop">Biltilbehør</string>
-        <string name="poi_atv_shop">ATV</string>
-        <string name="poi_cosmetics_shop">Kosmetik</string>
+        <string name="poi_atv">ATV</string>
+        <string name="poi_cosmetics">Kosmetik</string>
         <string name="poi_marketplace">Markedsplads</string>
-        <string name="poi_sewing_shop">Konfektion</string>
+        <string name="poi_sewing">Konfektion</string>
 
         <string name="poi_police">Politi</string>
         <string name="poi_fire_station">Brandstation</string>
@@ -144,7 +144,7 @@
         <string name="poi_railway_station">Banegård</string>
         <string name="poi_railway_platform">Perron</string>
         <string name="poi_railway_halt">Trinbrædt (forældet)</string>
-        <string name="poi_subway_entrance">Metroindgang</string>
+        <string name="poi_railway_subway_entrance">Metroindgang</string>
         <string name="poi_subway_station">Metrostation</string>
         <string name="poi_taxi">Taxaholdeplads</string>
 
@@ -239,7 +239,7 @@
         <string name="poi_pension_fund">Pensionskasse</string>
         <string name="poi_migration">Migration</string>
         <string name="poi_tax_inspection">Skattekontrol</string>
-        <string name="poi_administrative_office">Administrationskontor</string>
+        <string name="poi_office_administrative">Administrationskontor</string>
         <string name="poi_customs">Told</string>
 
         <string name="poi_pharmacy">Apotek</string>
@@ -270,14 +270,14 @@
         <string name="poi_insurance">Forsikring</string>
         <string name="poi_estate_agent">Ejendomsmægler</string>
         <string name="poi_lawyer">Advokat</string>
-        <string name="poi_telecommunication_office">Telekommunikation selskab</string>
+        <string name="poi_office_telecommunication">Telekommunikation selskab</string>
         <string name="poi_ngo">NGO</string>
         <string name="poi_town_hall">Rådhus</string>
         <string name="poi_employment_agency">Arbejdsformidling</string>
-        <string name="poi_research_office">Forskning</string>
-        <string name="poi_it_office">IT kontor</string>
-        <string name="poi_newspaper_office">Avisredaktion</string>
-        <string name="poi_architect_office">Arkitekt</string>
+        <string name="poi_research">Forskning</string>
+        <string name="poi_it">IT kontor</string>
+        <string name="poi_newspaper">Avisredaktion</string>
+        <string name="poi_architect">Arkitekt</string>
         <string name="poi_advertising_agency">Reklamebureau</string>
         <string name="poi_educational_institution">Uddannelsesinstitution</string>
         <string name="poi_studio">Lydstudio</string>
@@ -353,11 +353,11 @@
         <string name="poi_city_gate">Byport</string>
         <string name="poi_fort">Fort</string>
         <string name="poi_fountain">Springvand</string>
-        <string name="poi_ruins_historic">Historiske ruiner</string>
+        <string name="poi_historic_ruins">Historiske ruiner</string>
         <string name="poi_rune_stone">Runesten</string>
         <string name="poi_wreck">Skibsvrag</string>
-        <string name="poi_ship_historic">Historisk skib</string>
-        <string name="poi_mine_historic">Historisk mine</string>
+        <string name="poi_historic_ship">Historisk skib</string>
+        <string name="poi_historic_mine">Historisk mine</string>
         <string name="poi_monument">Monument</string>
         <string name="poi_zoo">Zoologisk have</string>
         <string name="poi_theme_park">Forlystelsespark</string>
@@ -370,19 +370,19 @@
         <string name="poi_chalet">Udlejningshytte</string>
 
         <string name="poi_place_of_worship">Sted for tilbedelse</string>
-        <string name="poi_place_of_worship_christian">Sted for tilbedelse: Kristen</string>
-        <string name="poi_place_of_worship_jewish">Sted for tilbedelse: Jødisk</string>
-        <string name="poi_place_of_worship_muslim">Sted for tilbedelse: Muslim</string>
-        <string name="poi_place_of_worship_sikh">Sted for tilbedelse: Sikh</string>
-        <string name="poi_place_of_worship_buddhist">Sted for tilbedelse: Buddhist</string>
-        <string name="poi_place_of_worship_hindu">Sted for tilbedelse: Hindu</string>
-        <string name="poi_place_of_worship_shinto">Sted for tilbedelse: Shinto</string>
-        <string name="poi_place_of_worship_taoist">Sted for tilbedelse: Taoistisk</string>
+        <string name="poi_religion_christian">Sted for tilbedelse: Kristen</string>
+        <string name="poi_religion_jewish">Sted for tilbedelse: Jødisk</string>
+        <string name="poi_religion_muslim">Sted for tilbedelse: Muslim</string>
+        <string name="poi_religion_sikh">Sted for tilbedelse: Sikh</string>
+        <string name="poi_religion_buddhist">Sted for tilbedelse: Buddhist</string>
+        <string name="poi_religion_hindu">Sted for tilbedelse: Hindu</string>
+        <string name="poi_religion_shinto">Sted for tilbedelse: Shinto</string>
+        <string name="poi_religion_taoist">Sted for tilbedelse: Taoistisk</string>
         <string name="poi_monastery">Kloster</string>
         <string name="poi_historic_monastery">Historisk kloster</string>
         <string name="poi_wayside_cross">Vejside kors</string>
         <string name="poi_wayside_shrine">Vejkants alter</string>
-        <string name="poi_tourism_information">Turistinformation</string>
+        <string name="poi_information">Turistinformation</string>
         <string name="poi_clock">Ur</string>
         <string name="poi_travel_agent">Rejsebureau</string>
         <string name="poi_viewpoint">Udsigtspunkt</string>
@@ -434,7 +434,7 @@
         <string name="poi_stripclub">Stripklub</string>
         <string name="poi_beach_resort">Badeby</string>
         <string name="poi_dog_park">Hundeskov</string>
-        <string name="poi_fishing_place">Fiskeplads</string>
+        <string name="poi_leisure_fishing">Fiskeplads</string>
         <string name="poi_hunting_stand">Jagtstand</string>
         <string name="poi_marina">Marina</string>
         <string name="poi_miniature_golf">Minigolf</string>
@@ -453,58 +453,58 @@
         <string name="poi_drinking_water">Drikkevand</string>
         <string name="poi_barbecue">Barbecue</string>
 
-        <string name="poi_agricultural_engines_craft">Landbrugsmaskiner</string>
-        <string name="poi_basket_maker">Kurvemager</string>
-        <string name="poi_beekeeper">Biavler</string>
-        <string name="poi_blacksmith">Smed</string>
-        <string name="poi_brewery">Bryggeri</string>
-        <string name="poi_boatbuilder">Bådebygger</string>
-        <string name="poi_bookbinder">Bogbinder</string>
-        <string name="poi_carpenter">Tømrer</string>
-        <string name="poi_carpet_layer">Tæppemontør</string>
-        <string name="poi_caterer">Catering</string>
-        <string name="poi_clockmaker">Urmager</string>
-        <string name="poi_dressmaker">Skrædder</string>
-        <string name="poi_electrician">Elektriker</string>
-        <string name="poi_gardener">Gartner</string>
-        <string name="poi_glaziery_craft">Glarmester</string>
-        <string name="poi_handicraft">Kunsthåndværk</string>
-        <string name="poi_hvac">VVS</string>
-        <string name="poi_insulation_craft">Isolering</string>
-        <string name="poi_jeweller">Juvelér</string>
-        <string name="poi_locksmith">Låsesmed</string>
-        <string name="poi_key_cutter">Nøglebar</string>
-        <string name="poi_metal_construction_craft">Metalarbejde</string>
-        <string name="poi_optician">Optiker</string>
-        <string name="poi_painter">Maler</string>
-        <string name="poi_parquet_layer">Gulvlægger</string>
-        <string name="poi_photographer">Fotograf</string>
-        <string name="poi_photographic_laboratory">Fotolaboratorium</string>
-        <string name="poi_plasterer">Stukatør</string>
-        <string name="poi_plumber">Blikkenslager</string>
-        <string name="poi_pottery_craft">Pottemager</string>
-        <string name="poi_rigger">Rigger</string>
-        <string name="poi_roofer">Tagdækker</string>
-        <string name="poi_saddler">Sadelmager</string>
-        <string name="poi_sailmaker">Sejlmager</string>
-        <string name="poi_sawmill">Savværk</string>
-        <string name="poi_scaffolder">Stilladsarbejder</string>
-        <string name="poi_sculptor">Billedhugger</string>
-        <string name="poi_shoemaker">Skomager</string>
-        <string name="poi_stand_builder">Udstillingsbygger</string>
-        <string name="poi_stonemason">Stenhugger</string>
-        <string name="poi_sun_protection_craft">Solafskærmning</string>
-        <string name="poi_sweep">Skorstensfejer</string>
-        <string name="poi_tailor">Skrædder</string>
-        <string name="poi_tiler">Brolægger</string>
-        <string name="poi_tinsmith">Blikkenslager</string>
-        <string name="poi_upholsterer">Møbelpolstrer</string>
-        <string name="poi_watchmaker">Urmager</string>
-        <string name="poi_window_construction">Vinduefremstilling</string>
+        <string name="poi_craft_agricultural_engines">Landbrugsmaskiner</string>
+        <string name="poi_craft_basket_maker">Kurvemager</string>
+        <string name="poi_craft_beekeeper">Biavler</string>
+        <string name="poi_craft_blacksmith">Smed</string>
+        <string name="poi_craft_brewery">Bryggeri</string>
+        <string name="poi_craft_boatbuilder">Bådebygger</string>
+        <string name="poi_craft_bookbinder">Bogbinder</string>
+        <string name="poi_craft_carpenter">Tømrer</string>
+        <string name="poi_craft_carpet_layer">Tæppemontør</string>
+        <string name="poi_craft_caterer">Catering</string>
+        <string name="poi_craft_clockmaker">Urmager</string>
+        <string name="poi_craft_dressmaker">Skrædder</string>
+        <string name="poi_craft_electrician">Elektriker</string>
+        <string name="poi_craft_gardener">Gartner</string>
+        <string name="poi_craft_glaziery">Glarmester</string>
+        <string name="poi_craft_handicraft">Kunsthåndværk</string>
+        <string name="poi_craft_hvac">VVS</string>
+        <string name="poi_craft_insulation">Isolering</string>
+        <string name="poi_craft_jeweller">Juvelér</string>
+        <string name="poi_craft_locksmith">Låsesmed</string>
+        <string name="poi_craft_key_cutter">Nøglebar</string>
+        <string name="poi_craft_metal_construction">Metalarbejde</string>
+        <string name="poi_craft_optician">Optiker</string>
+        <string name="poi_craft_painter">Maler</string>
+        <string name="poi_craft_parquet_layer">Gulvlægger</string>
+        <string name="poi_craft_photographer">Fotograf</string>
+        <string name="poi_craft_photographic_laboratory">Fotolaboratorium</string>
+        <string name="poi_craft_plasterer">Stukatør</string>
+        <string name="poi_craft_plumber">Blikkenslager</string>
+        <string name="poi_craft_pottery">Pottemager</string>
+        <string name="poi_craft_rigger">Rigger</string>
+        <string name="poi_craft_roofer">Tagdækker</string>
+        <string name="poi_craft_saddler">Sadelmager</string>
+        <string name="poi_craft_sailmaker">Sejlmager</string>
+        <string name="poi_craft_sawmill">Savværk</string>
+        <string name="poi_craft_scaffolder">Stilladsarbejder</string>
+        <string name="poi_craft_sculptor">Billedhugger</string>
+        <string name="poi_craft_shoemaker">Skomager</string>
+        <string name="poi_craft_stand_builder">Udstillingsbygger</string>
+        <string name="poi_craft_stonemason">Stenhugger</string>
+        <string name="poi_craft_sun_protection">Solafskærmning</string>
+        <string name="poi_craft_sweep">Skorstensfejer</string>
+        <string name="poi_craft_tailor">Skrædder</string>
+        <string name="poi_craft_tiler">Brolægger</string>
+        <string name="poi_craft_tinsmith">Blikkenslager</string>
+        <string name="poi_craft_upholsterer">Møbelpolstrer</string>
+        <string name="poi_craft_watchmaker">Urmager</string>
+        <string name="poi_craft_window_construction">Vinduefremstilling</string>
 
         <string name="poi_funeral_directors">Bedemand</string>
-        <string name="poi_computer_craft">Computerværksted</string>
-        <string name="poi_beauty_salon">Skønhedssalon</string>
+        <string name="poi_craft_computer">Computerværksted</string>
+        <string name="poi_beauty">Skønhedssalon</string>
         <string name="poi_beauty_salon_nails">Neglesalon</string>
         <string name="poi_hairdresser">Frisør</string>
         <string name="poi_massage">Massage</string>
@@ -527,7 +527,7 @@
         <string name="poi_pawnbroker">Pantelåner</string>
         <string name="poi_currencyexchange">Vekselkontor</string>
         <string name="poi_accountant">Revisor</string>
-        <string name="poi_bitcoin_yes">Bitcoin betaling</string>
+        <string name="poi_bitcoin">Bitcoin betaling</string>
 
         <string name="poi_cave_entrance">Huleindgang</string>
         <string name="poi_peak">Bjergtinde</string>
@@ -649,7 +649,7 @@
 	<string name="poi_dock">Dok</string>
 	<string name="poi_amusement_ride">Forlystelse</string>
 	<string name="poi_attraction_animal">Dyr (attraktion)</string>
-	<string name="poi_ferris_wheel">Pariserhjul</string>
+	<string name="poi_big_wheel">Pariserhjul</string>
 	<string name="poi_carousel">Karrusel</string>
 	<string name="poi_maze">Labyrint</string>
 	<string name="poi_roller_coaster">Rutschebane</string>
@@ -684,7 +684,7 @@
 	<string name="poi_user_defined_other">Brugerdefineret</string>
 	
 	<string name="poi_military_landuse">Militærzone</string>
-	<string name="poi_child_clothes_shop">Børnetøj</string>
+	<string name="poi_child_clothes">Børnetøj</string>
 	<string name="poi_apartment">Lejlighed</string>
 
 	<string name="poi_farm">Gårdbutik</string>
@@ -698,7 +698,7 @@
 	<string name="poi_internet_access_public">Internetadgang: offentlig</string>
 	<string name="poi_internet_access_service">Internetadgang: service</string>
 	
-	<string name="poi_general">Landhandel</string>
+	
 	<string name="poi_car">Bilforhandler</string>
 	<string name="poi_railway_buffer_stop">Jernbane sporstopper</string>
 	<string name="poi_wine">Vinhandel</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index d829b2e00e..39eb0d51cb 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -42,7 +42,7 @@
     <string name="audionotes_location_not_defined">Placering der skal tilknyttes til noten er ikke defineret endnu. \'Brug placering ...\' for at tildele en note til den angivne placering</string>
     
     <string name="map_widget_audionotes">Audionoter</string>
-    <string name="audionotes_plugin_description">Udvidelsen giver funktionalitet og knapper til at tage audio-/foto-/videonoter under en tur</string>
+    <string name="audionotes_plugin_description">Audio-/videonoter udvidelse giver funktionalitet til at tage audio-/foto-/videonoter under en tur, enten ved hjælp en knap på skærmen, eller direkte fra kontekstmenuen for en position på kortet.</string>
     <string name="audionotes_plugin_name">Audio-/videonoter</string>
     <string name="index_srtm_parts">dele</string>
     <string name="index_srtm_ele">Højdekurver</string>
@@ -294,7 +294,7 @@
 	<string name="osmand_parking_time_limit">Tidsbegrænset parkering</string>
 	<string name="osmand_parking_time_no_limit">Tidsubegrænset parkering</string>
 	<string name="osmand_parking_position_description">Den parkerede bils position. %1$s</string>
-	<string name="osmand_parking_position_description_add">Afhent bilen på:</string>
+	<string name="osmand_parking_position_description_add">Afhent bilen:</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Parkeringssted</string>
 	<string name="osmand_parking_plugin_description">Udvidelsen er udviklet til at anvende OsmAnd til nemt huske placeringen af den parkerede bil.</string>
@@ -354,18 +354,18 @@
 	
 	
 	<string name="osmand_background_plugin_description">Viser indstillinger til at aktivere sporing og navigation i dvale (slukket skærm) tilstand via periodisk at vække GPS-enheden.</string>
-	<string name="osmand_accessibility_description">"Viser indstillinger til at aktivere særlige  tilgængelighedsfunktioner."</string>
+	<string name="osmand_accessibility_description">"Viser indstillinger til at aktivere særlige  tilgængelighedsfunktioner.\n\nDette plugin gør at en enhed er tilgængelighedsfunktioner til rådighed direkte i OsmAnd, og letter bl.a. justere talen sats for TTSstemmerne, konfiguration retningsbestemt-pad skærm navigation ved hjælp af en trackball til zoomknappen, eller ved hjælp af tekst-til-tale feedback."</string>
 	<string name="extra_settings">Avancerede indstillinger</string>
 	<string name="osmand_monitoring_description">Viser knappen og indstillinger som muliggør optagelse af dine ture til en lokal GPX-fil eller til en online webtjeneste.</string>
 	<string name="osmand_rastermaps_plugin_description">"Udvidelsen giver adgang til mange typer af online (såkaldte del eller raster) kort, fra foruddefinerede OpenStreetMap delkort (som Mapnik) til satellitbilleder og lag til særlig anvendelse som vejr-, klima- eller geologiskekort og relief lag osv.\n\nEnhver af disse kort kan enten bruges som det vigtigste (primær) kort, der skal vises på kortskærmen, eller som en over- eller underlejring til et andet basiskort (såsom OsmAnd offline kort). For at gøre underlejringskortet mere synlig, kan visse elementer af OsmAnd vektorkort nemt skjules via \'Konfigurer kort\' menuen som ønsket.
 \n\nDelkort kan hentes direkte via online-kilder, eller kan fremstilles til offline brug (og manuelt kopieres til OsmAnd datamappen) som en SQLite database. Kort kan fremstilles ved hjælp af en række 3. parts kortværktøjer. "</string>
 	
-	<string name="osmand_development_plugin_description">Viser indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller optegningsydeevne indikation.</string>
+	<string name="osmand_development_plugin_description">Viser indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller optegningsydeevne indikation, eller stemmevejledning.\nIndstillinger er beregnet til udviklere og er ikke nødvendig for den almindelige bruger.</string>
 	<string name="plugins_screen">Udvidelser</string>
 	
 	<string name="prefs_plugins_descr">Udvidelser aktiverer avancerede indstillinger og ekstra funktionalitet</string>
 	<string name="prefs_plugins">Udvidelser</string>
-	<string name="osm_editing_plugin_description">Udvidelsen giver OsmAnd mulighed for at lave OSM bidrag såsom at oprette eller ændre OSM interessepunkter (IP), åbne eller kommentere OSM fejl, og bidrage med optagede GPX-filer. Brug af funktionen kræver OSM legitimationsoplysninger.</string>
+	<string name="osm_editing_plugin_description">Udvidelsen giver OsmAnd mulighed for at lave OSM bidrag såsom at oprette eller ændre OSM interessepunkter (IP), åbne eller kommentere OSM fejl, og bidrage med optagede GPX-filer.\n\nOSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt. For nærmere oplysninger henvises til http://openstreetmap.org. Aktiv deltagelse er værdsat, og bidragene kan ske direkte fra OsmAnd, hvis du angiver dine personlige OSM legitimationsoplysninger.</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vektorkort vises sandsynligvis hurtigere. Fungerer muligvis ikke godt på nogle enheder.</string>
 	<string name="play_commands_of_currently_selected_voice">Afspil kommandoer med den valgte stemme</string>
 	<string name="debugging_and_development">OsmAnd udvikling</string>
@@ -1070,7 +1070,7 @@
 	<string name="osmand_routing_experimental">OsmAnd offline-navigation er en eksperimentel funktion og den virker ikke for afstande på mere end ca. 20 km.
 \nNavigationstjenesten skiftes midlertidig til online CloudMade.</string>
 	<string name="search_offline_address">Offline søgning</string>
-	<string name="route_general_information">Total afstand %1$s,\n rejsetid %2$d t %3$d m.</string>
+	<string name="route_general_information">Total afstand %1$s, rejsetid %2$d t %3$d m.</string>
 	<string name="router_service_descr">Vælg en online eller offline navigationstjeneste</string>
 	<string name="router_service">Navigationstjeneste</string>
 	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgængelig!</string>
@@ -1505,7 +1505,7 @@
 	<string name="navigation_intent_invalid">Ugyldigt format: %s</string>
 <string name="osmo_settings_uuid">Unik enheds-id</string>
     <string name="osmo_settings_descr">Konfigurer indstillinger for overvågning og opsætning af personlig overvågningskanal</string>
-    <string name="osmo_plugin_description">"Viser indstillingerne til at bruge OsMo avanceret live overvågning, se http://osmo.mobi. Spor andre enheder og bliv selv sporet. Opret anonyme grupper, del hinandens placering og kommuniker. Har forskellige indstillinger for session sporing eller permanent sporing.\n\nAnonyme grupper er begrænset til et antal dage og nogle funktioner, dvs der er ingen fjernkontrol og gruppeadministrator. Fuldt funktionelle grupper bør oprettes på hjemmesiden og kun registrerede brugere har adgang til dem. "</string>
+    <string name="osmo_plugin_description">"Viser indstillingerne til at bruge OsMo avanceret live overvågning, se http://osmo.mobi.\n\nSpor andre enheder og bliv selv sporet. Opret anonyme grupper, del hinandens placering og kommuniker. Har forskellige indstillinger for session sporing eller permanent sporing.\n\nAnonyme grupper er begrænset til et antal dage og nogle funktioner, dvs der er ingen fjernkontrol og ingen gruppeadministrator. Fuldt funktionelle grupper, kan på den anden side oprettes på hjemmesiden, og kun registrerede brugere har adgang til dem. "</string>
     <string name="osmo_plugin_name">OsMo overvågning</string>
     <string name="osmo_settings">OsMo overvågning</string>
    	<string name="keep_informing_never">Kun manuelt (tryk på pilen)</string>
@@ -1860,12 +1860,11 @@
 	<string name="share_note">Del note</string>
 	
 	<string name="plugin_touringview_name">Touring</string>
-	<string name="plugin_nautical_descr">"Aktivering ændrer kortformat til maritim, som viser alle sømærker og søkortsymboler.
-\n\nEt kort, der indeholder alle maritime symboler, kan hentes som \'Sømærker (på verdensplan)\'.
-\n\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket. "</string>
-	<string name="plugin_ski_descr">"Aktivering ændrer kortformat til \'Vinter og ski\', som viser alle landskabstræk under vinterlige forhold.
-\n\nEt kort som viser alle skiløjper og langrendsruter, kan hentes som \'Skikort (på verdensplan)\'.
-\n\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket. "</string>
+	<string name="plugin_nautical_descr">"Udvidelsen beriger OsmAnd kort og navigation app til også producere maritimekort til sejlsport, sejlads og andre former for vandsport.
+\n\nEn særlig kort add-on til OsmAnd vil give alle maritime sømærker og søkortsymboler, for indre såvel som for kystnært navigation. Beskrivelsen af hvert sømærke giver oplysninger, der er nødvendige for at identificere dem og deres betydning (kategori, form, farve, sekvens, reference, etc.).
+\n\nFor at vende tilbage til en af OsmAnd konventionelle kortformat, enten simpelthen deaktivere den igen, eller ved at ændre \'Kortformat\' under \'Konfigurer kort \"som ønsket. "</string>
+	<string name="plugin_ski_descr">"Udvidelsen for OsmAnd sætter lige ved hånden detaljerne om global skiløjper, langrendsruter, alpine skiruter, svævebaner og skilifte. Ruter og pister vises farvekodede efter sværhedsgrad, og vises i et særligt \'Vinter\' kortformat, som et sne-farvet vinterlandskab.\n\nEt kort som viser alle skiløjper og langrendsruter, kan hentes som \'Skikort (på verdensplan)\'.\nAktivering ændrer kortformat til \'Vinter og ski\', som viser alle landskabstræk under vinterlige forhold.
+\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket. "</string>
 	<string name="plugin_touringview_descr">"Aktivering ændrer kortformat til \'Touring\', det er en særlig højdetaljevisning for rejsende og erhvervschauffører.
 \n\nVisning giver, på et givet kortzoom, den maksimale mængde rejseoplysninger til rådighed i kortdata (især veje, spor, stier, og orienteringsmærker).\n\nViser også tydeligt alle vejtyper utvetydigt med farvekoder, som er nyttigt, f.eks ved med kørsel store køretøjer.
 \n\nGiver særlige touring muligheder såsom cykelruter eller alpine bjergruter.\n\nEt særligt kort er ikke nødvendigt, visningen er skabt ud fra standardkort.
@@ -1964,4 +1963,11 @@
 	<string name="waypoint_visit_after">Besøg efter</string>
     <string name="waypoint_visit_before">Besøg før</string>
     <string name="shared_string_collapse">Fold sammen</string>
+	<string name="action_create">Handling opretter</string>
+	<string name="action_modify">Handling rediger</string>
+	<string name="action_delete">Handling slet</string>
+	<string name="osm_edits">OSM redigeringer</string>
+	<string name="osmand_parking_hour">t</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Tilbage</string> <string name="parking_place_limited">Tidsbegrænset parkering</string>
+	<string name="your_edits">Dine redigeringer</string>
+    <string name="osmand_parking_outdated">Forældet</string>
 	</resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 0231c70e91..6a51399149 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -4,7 +4,7 @@
 	<string name="poi_9pin">Kegeln</string>
 	<string name="poi_accountant">Buchhalter</string>
 	<string name="poi_adit">Stollen</string>
-	<string name="poi_administrative_office">Verwaltungsstelle</string>
+	<string name="poi_office_administrative">Verwaltungsstelle</string>
 	<string name="poi_advertising_agency">Werbeagentur</string>
 	<string name="poi_aerialway_cable_car">Seilbahn</string>
 	<string name="poi_aerialway_chair_lift">Sessellift</string>
@@ -20,69 +20,69 @@
 	<string name="poi_aerialway_t_bar">Schlepplift</string>
 	<string name="poi_aeroway_gate">Flughafengate</string>
 	<string name="poi_aeroway_terminal">Flughafenterminal</string>
-	<string name="poi_agricultural_engines_craft">Landmaschinen</string>
+	<string name="poi_craft_agricultural_engines">Landmaschinen</string>
 	<string name="poi_airport">Flughafen</string>
 	<string name="poi_alcohol">Spirituosenladen</string>
 	<string name="poi_alpine_hut">Berghütte</string>
 	<string name="poi_ambulance_station">Rettungswache</string>
-	<string name="poi_anime_shop">Anime-Shop</string>
-	<string name="poi_antiques_shop">Antiquitätenhändler</string>
+	<string name="poi_anime">Anime-Shop</string>
+	<string name="poi_antiques">Antiquitätenhändler</string>
 	<string name="poi_archaeological_site">Aarchäologischer Fundort</string>
 	<string name="poi_archery">Bogenschießen</string>
-	<string name="poi_architect_office">Architekturbüro</string>
-	<string name="poi_art_shop">Kunsthandlung</string>
+	<string name="poi_architect">Architekturbüro</string>
+	<string name="poi_art">Kunsthandlung</string>
 	<string name="poi_arts_centre">Kulturzentrum</string>
 	<string name="poi_artwork">Kunstwerk</string>
 	<string name="poi_astronomical_observatory">Observatorium</string>
 	<string name="poi_athletics">Sport</string>
 	<string name="poi_atm">Geldautomat</string>
 	<string name="poi_attraction">Attraktion</string>
-	<string name="poi_atv_shop">Quad-Store</string>
+	<string name="poi_atv">Quad-Store</string>
 	<string name="poi_audiologist">Gehörspezialist</string>
 	<string name="poi_australian_football">Australischer Fußball</string>
 	<string name="poi_baby_goods">Babyartikel</string>
 	<string name="poi_baby_hatch">Babyklappe</string>
-	<string name="poi_bag_shop">Taschengeschäft</string>
+	<string name="poi_bag">Taschengeschäft</string>
 	<string name="poi_bailiff">Gerichtsvollzieher</string>
 	<string name="poi_bakery">Bäckerei</string>
 	<string name="poi_bank">Bank</string>
 	<string name="poi_bar">Bar</string>
 	<string name="poi_barbecue">Barbecue</string>
 	<string name="poi_baseball">Baseball</string>
-	<string name="poi_basket_maker">Korbflechter</string>
+	<string name="poi_craft_basket_maker">Korbflechter</string>
 	<string name="poi_basketball">Basketball</string>
-	<string name="poi_bathroom_furnishing_shop">Badmöbel</string>
+	<string name="poi_bathroom_furnishing">Badmöbel</string>
 	<string name="poi_battlefield">Schlachtfeld</string>
 	<string name="poi_bay">Bucht</string>
 	<string name="poi_beach">Strand</string>
 	<string name="poi_beach_resort">Badeort</string>
 	<string name="poi_beachvolleyball">Beachvolleyball</string>
-	<string name="poi_beauty_salon">Schönheitssalon</string>
+	<string name="poi_beauty">Schönheitssalon</string>
 	<string name="poi_beauty_salon_nails">Nagelstudio</string>
-	<string name="poi_bed_shop">Badezimmereinrichtung</string>
-	<string name="poi_bedding_shop">Bettwarengeschäft</string>
-	<string name="poi_beekeeper">Bienenzüchter</string>
+	<string name="poi_bed">Badezimmereinrichtung</string>
+	<string name="poi_bedding">Bettwarengeschäft</string>
+	<string name="poi_craft_beekeeper">Bienenzüchter</string>
 	<string name="poi_beverages">Getränkegeschäft</string>
 	<string name="poi_bicycle_parking">Fahrradständer</string>
 	<string name="poi_bicycle_rental">Fahrradvermietung</string>
-	<string name="poi_bicycle_shop">Fahrradgeschäft</string>
+	<string name="poi_bicycle">Fahrradgeschäft</string>
 	<string name="poi_bicycle_track">Radweg </string>
 	<string name="poi_biergarten">Biergarten</string>
-	<string name="poi_bitcoin_yes">Bitcoin-Bezahlmöglichkeit</string>
-	<string name="poi_blacksmith">Schmied</string>
+	<string name="poi_bitcoin">Bitcoin-Bezahlmöglichkeit</string>
+	<string name="poi_craft_blacksmith">Schmied</string>
 	<string name="poi_blood_bank">Blutbank</string>
 	<string name="poi_boat_sharing">Bootsverleih</string>
-	<string name="poi_boatbuilder">Schiffsbauer</string>
+	<string name="poi_craft_boatbuilder">Schiffsbauer</string>
 	<string name="poi_boatyard">Schiffsanlegeplatz</string>
-	<string name="poi_bookbinder">Buchbinder</string>
+	<string name="poi_craft_bookbinder">Buchbinder</string>
 	<string name="poi_bookmaker">Buchmacher</string>
-	<string name="poi_bookshop">Buchhandlung</string>
+	<string name="poi_books">Buchhandlung</string>
 	<string name="poi_border_control">Grenzkontrolle</string>
 	<string name="poi_boules">Bäcker</string>
 	<string name="poi_boundary_stone">Grenzstein</string>
 	<string name="poi_boutique">Boutique</string>
 	<string name="poi_bowls">Schüsseln</string>
-	<string name="poi_brewery">Brauerei</string>
+	<string name="poi_craft_brewery">Brauerei</string>
 	<string name="poi_bridge">Brücke</string>
 	<string name="poi_brothel">Bordell</string>
 	<string name="poi_bus_station">Bushaltestelle (obsolet)</string>
@@ -99,19 +99,19 @@
 	<string name="poi_car_shop">Autohändler</string>
 	<string name="poi_car_wash">Autowaschanlage</string>
 	<string name="poi_caravan_site">Campingplatz</string>
-	<string name="poi_carpenter">Tischler</string>
-	<string name="poi_carpet_layer">Teppichleger</string>
-	<string name="poi_carpet_shop">Teppiche</string>
+	<string name="poi_craft_carpenter">Tischler</string>
+	<string name="poi_craft_carpet_layer">Teppichleger</string>
+	<string name="poi_carpet">Teppiche</string>
 	<string name="poi_casino">Casino</string>
 	<string name="poi_castle">Burg</string>
-	<string name="poi_caterer">Partyservice</string>
+	<string name="poi_craft_caterer">Partyservice</string>
 	<string name="poi_cave_entrance">Höhleneingang</string>
 	<string name="poi_cemetery">Friedhof</string>
 	<string name="poi_chalet">Berghütte</string>
 	<string name="poi_charging_station">Ladestation</string>
-	<string name="poi_chemist_shop">Drogerie</string>
+	<string name="poi_chemist">Drogerie</string>
 	<string name="poi_chess">Schach</string>
-	<string name="poi_children_clothes_shop">Kinderbekleidungsgeschäft</string>
+	<string name="poi_children_clothes">Kinderbekleidungsgeschäft</string>
 	<string name="poi_cinema">Kino</string>
 	<string name="poi_circus">Zirkus</string>
 	<string name="poi_city">Stadt</string>
@@ -120,8 +120,8 @@
 	<string name="poi_climbing">Klettern</string>
 	<string name="poi_clinic">Klinik</string>
 	<string name="poi_clock">Uhr</string>
-	<string name="poi_clockmaker">Uhrmacher</string>
-	<string name="poi_clothes_shop">Bekleidungsgeschäft</string>
+	<string name="poi_craft_clockmaker">Uhrmacher</string>
+	<string name="poi_clothes">Bekleidungsgeschäft</string>
 	<string name="poi_club_art">Kunsthandlung</string>
 	<string name="poi_club_astronomy">Sternkundeverein</string>
 	<string name="poi_club_automobile">Automobilklub</string>
@@ -151,13 +151,13 @@
 	<string name="poi_community_centre">Gemeindezentrum</string>
 	<string name="poi_company">Firma</string>
 	<string name="poi_compressed_air">Druckluft</string>
-	<string name="poi_computer_craft">Computer</string>
-	<string name="poi_computer_shop">Computer-Geschäft</string>
+	<string name="poi_craft_computer">Computer</string>
+	<string name="poi_computer">Computer-Geschäft</string>
 	<string name="poi_confectionery">Süßwaren</string>
 	<string name="poi_construction">Anlage</string>
 	<string name="poi_convenience">Lebensmittelgeschäft</string>
 	<string name="poi_copyshop">Copy-Shop</string>
-	<string name="poi_cosmetics_shop">Kosmetik</string>
+	<string name="poi_cosmetics">Kosmetik</string>
 	<string name="poi_courthouse">Gerichtsgebäude</string>
 	<string name="poi_crater">Krater</string>
 	<string name="poi_crematorium">Krematorium</string>
@@ -165,7 +165,7 @@
 	<string name="poi_cricket_nets">Cricket-Netz</string>
 	<string name="poi_croquet">Krocket</string>
 	<string name="poi_currencyexchange">Wechselstube</string>
-	<string name="poi_curtain_shop">Vorhanggeschäft</string>
+	<string name="poi_curtain">Vorhanggeschäft</string>
 	<string name="poi_customs">Benutzerdefiniert</string>
 	<string name="poi_cycling">Radsport</string>
 	<string name="poi_dairy">Molkerei </string>
@@ -174,27 +174,27 @@
 	<string name="poi_deli">Delikatessen</string>
 	<string name="poi_dentist">Zahnarzt</string>
 	<string name="poi_department_store">Kaufhaus</string>
-	<string name="poi_dive_shop">Tauchgerät</string>
+	<string name="poi_dive">Tauchgerät</string>
 	<string name="poi_diving">Tauschen</string>
 	<string name="poi_doctors">Arzt</string>
 	<string name="poi_dog_park">Hundepark</string>
 	<string name="poi_dog_racing">Hunderennen</string>
-	<string name="poi_doityourself_shop">Baumarkt</string>
-	<string name="poi_dressmaker">Schneider</string>
+	<string name="poi_doityourself">Baumarkt</string>
+	<string name="poi_craft_dressmaker">Schneider</string>
 	<string name="poi_drinking_water">Trinkwasser</string>
 	<string name="poi_driving_school">Fahrschule</string>
 	<string name="poi_dry_cleaning">Chemische Reinigung</string>
 	<string name="poi_educational_institution">Bildungseinrichtung</string>
-	<string name="poi_electrician">Elektriker</string>
-	<string name="poi_electronics_shop">Elektronik-Geschäft</string>
+	<string name="poi_craft_electrician">Elektriker</string>
+	<string name="poi_electronics">Elektronik-Geschäft</string>
 	<string name="poi_embassy">Botschaft</string>
 	<string name="poi_emergency_access_point">Nofall-Zugangspunkt</string>
 	<string name="poi_emergency_phone">Nofall-Telefon</string>
 	<string name="poi_employment_agency">Arbeitsamt</string>
 	<string name="poi_equestrian">Reiter</string>
-	<string name="poi_erotic_shop">Sex-Shop</string>
+	<string name="poi_erotic">Sex-Shop</string>
 	<string name="poi_estate_agent">Immobilienmakler</string>
-	<string name="poi_fabric_shop">Werksverkauf</string>
+	<string name="poi_fabric">Werksverkauf</string>
 	<string name="poi_fast_food">Fast Food</string>
 	<string name="poi_ferry_terminal">Fährhafen</string>
 	<string name="poi_fire_extinguisher">Feuerlöscher</string>
@@ -204,30 +204,30 @@
 	<string name="poi_fire_station">Feuerwehr</string>
 	<string name="poi_fire_water_pond">Löschteich</string>
 	<string name="poi_first_aid">Erste Hilfe</string>
-	<string name="poi_fishing_place">Fischen</string>
-	<string name="poi_fishing_shop">Angelzeug</string>
+	<string name="poi_leisure_fishing">Fischen</string>
+	<string name="poi_fishing">Angelzeug</string>
 	<string name="poi_fjord">Fjord</string>
 	<string name="poi_florist">Blumenhandlung</string>
 	<string name="poi_food_court">Markthalle</string>
 	<string name="poi_ford">Furt</string>
 	<string name="poi_fort">Festung</string>
 	<string name="poi_fountain">Brunnen</string>
-	<string name="poi_frame_shop">Bilderrahmen-Geschäft</string>
+	<string name="poi_frame">Bilderrahmen-Geschäft</string>
 	<string name="poi_fuel">Tankstelle</string>
 	<string name="poi_funeral_directors">Bestatter</string>
 	<string name="poi_funicular">Seilbahn</string>
-	<string name="poi_furniture_shop">Möbelgeschäft</string>
+	<string name="poi_furniture">Möbelgeschäft</string>
 	<string name="poi_garages">Garage</string>
 	<string name="poi_garden_centre">Gartencenter</string>
-	<string name="poi_gardener">Gärtner</string>
-	<string name="poi_gas_shop">Flüssiggas</string>
+	<string name="poi_craft_gardener">Gärtner</string>
+	<string name="poi_gas">Flüssiggas</string>
 	<string name="poi_gate">Tor</string>
-	<string name="poi_general_shop">Gemischtwarenhandlung</string>
+	<string name="poi_general">Gemischtwarenhandlung</string>
 	<string name="poi_geyser">Geisir</string>
-	<string name="poi_gift_shop">Geschenkeladen</string>
+	<string name="poi_gift">Geschenkeladen</string>
 	<string name="poi_glacier">Gletscher</string>
-	<string name="poi_glaziery_craft">Glasereihandwerk</string>
-	<string name="poi_glaziery_shop">Glaserei</string>
+	<string name="poi_craft_glaziery">Glasereihandwerk</string>
+	<string name="poi_glaziery">Glaserei</string>
 	<string name="poi_golf">Golf</string>
 	<string name="poi_golf_course">Golfplatz</string>
 	<string name="poi_government">Regierung</string>
@@ -239,16 +239,16 @@
 	<string name="poi_hairdresser">Friseur</string>
 	<string name="poi_hamlet">Weiler</string>
 	<string name="poi_handball">Handball</string>
-	<string name="poi_handicraft">Kunsthandwerk</string>
-	<string name="poi_hardware_shop">Eisenhandlung</string>
+	<string name="poi_craft_handicraft">Kunsthandwerk</string>
+	<string name="poi_hardware">Eisenhandlung</string>
 	<string name="poi_healthcare_alternative">Alternativmedizin</string>
 	<string name="poi_healthcare_centre">Gesundheitszentrum</string>
 	<string name="poi_healthcare_rehabilitation">Rehabilitation</string>
 	<string name="poi_healthcare_yes">Medizinische Einrichtung</string>
-	<string name="poi_hearing_aids_shop">Hörgeräte</string>
+	<string name="poi_hearing_aids">Hörgeräte</string>
 	<string name="poi_helipad">Hubschrauberlandeplatz</string>
 	<string name="poi_herbalist">Kräuterladen</string>
-	<string name="poi_hifi_shop">HiFi-Geschäft</string>
+	<string name="poi_hifi">HiFi-Geschäft</string>
 	<string name="poi_historic_monastery">Historisches Kloster</string>
 	<string name="poi_hockey">Hockey</string>
 	<string name="poi_horse_racing">Pferderennen</string>
@@ -257,28 +257,28 @@
 	<string name="poi_hostel">Jugendherberge</string>
 	<string name="poi_hot_spring">Heiße Quellen</string>
 	<string name="poi_hotel">Hotel</string>
-	<string name="poi_houseware_shop">Haushaltsgeräteladen</string>
-	<string name="poi_hunting_shop">Jagdtausrüstung</string>
+	<string name="poi_houseware">Haushaltsgeräteladen</string>
+	<string name="poi_hunting">Jagdtausrüstung</string>
 	<string name="poi_hunting_stand">Jägerstand</string>
-	<string name="poi_hvac">Heizung, Lüftung und Klimatisierung</string>
+	<string name="poi_craft_hvac">Heizung, Lüftung und Klimatisierung</string>
 	<string name="poi_ice_cream">Eisdiele</string>
 	<string name="poi_ice_rink">Eislaufbahn</string>
 	<string name="poi_ice_skating">Eislaufen</string>
 	<string name="poi_ice_stock">Eisstockschießen</string>
-	<string name="poi_insulation_craft">Schutz</string>
+	<string name="poi_craft_insulation">Schutz</string>
 	<string name="poi_insurance">Versicherung</string>
-	<string name="poi_interior_decoration_shop">Innenausstatter</string>
+	<string name="poi_interior_decoration">Innenausstatter</string>
 	<string name="poi_internet_cafe">Internet Cafe</string>
 	<string name="poi_island">Insel</string>
 	<string name="poi_islet">Inselchen</string>
 	<string name="poi_isolated_dwelling">Freistehendes Haus</string>
-	<string name="poi_it_office">IT-Dienst</string>
-	<string name="poi_jeweller">Juwelier</string>
-	<string name="poi_jewelry_shop">Juwelier</string>
-	<string name="poi_key_cutter">Schlüsselmeister</string>
+	<string name="poi_it">IT-Dienst</string>
+	<string name="poi_craft_jeweller">Juwelier</string>
+	<string name="poi_jewelry">Juwelier</string>
+	<string name="poi_craft_key_cutter">Schlüsselmeister</string>
 	<string name="poi_kindergarten">Kindergarten</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Küchengeräte</string>
+	<string name="poi_kitchen">Küchengeräte</string>
 	<string name="poi_korfbal">Korfball</string>
 	<string name="poi_landfill">Mülldeponie</string>
 	<string name="poi_laundry">Wäscherei</string>
@@ -289,13 +289,13 @@
 	<string name="poi_lighthouse">Leuchtturm</string>
 	<string name="poi_locality">Lokalität</string>
 	<string name="poi_lock_gate">Schleusentor</string>
-	<string name="poi_locksmith">Schlosser</string>
+	<string name="poi_craft_locksmith">Schlosser</string>
 	<string name="poi_mall">Einkaufszentrum</string>
 	<string name="poi_marina">Yachthafen</string>
 	<string name="poi_marketplace">Marktplatz</string>
 	<string name="poi_massage">Massagesalon</string>
 	<string name="poi_memorial">Gedenkstätte</string>
-	<string name="poi_metal_construction_craft">Metallbau</string>
+	<string name="poi_craft_metal_construction">Metallbau</string>
 	<string name="poi_midwife">Hebamme</string>
 	<string name="poi_migration">Wanderung</string>
 	<string name="poi_military">Militärzone</string>
@@ -306,10 +306,10 @@
 	<string name="poi_military_naval_base">Marinestützpunkt</string>
 	<string name="poi_military_nuclear_explosion_site">Atombombenexplosionsgebiet</string>
 	<string name="poi_military_range">Militärbereich</string>
-	<string name="poi_mine_historic">Historisches Bergwerk</string>
+	<string name="poi_historic_mine">Historisches Bergwerk</string>
 	<string name="poi_mineshaft">Grubenschacht</string>
 	<string name="poi_miniature_golf">Minigolf</string>
-	<string name="poi_mobile_phone_shop">Handy-Geschäft</string>
+	<string name="poi_mobile_phone">Handy-Geschäft</string>
 	<string name="poi_monastery">Kloster</string>
 	<string name="poi_money_lender">Pfandleiher</string>
 	<string name="poi_monument">Denkmal</string>
@@ -317,46 +317,46 @@
 	<string name="poi_motel">Motel</string>
 	<string name="poi_motor_sport">Motorsport</string>
 	<string name="poi_motorcycle_parking">Motorradparkplatz</string>
-	<string name="poi_motorcycle_shop">Motorradgeschäft</string>
+	<string name="poi_motorcycle">Motorradgeschäft</string>
 	<string name="poi_motorway_junction">Autobahnkreuz</string>
 	<string name="poi_mountain_pass">Passstraße</string>
 	<string name="poi_multi_sport">Multi-Sport</string>
 	<string name="poi_museum">Museum</string>
-	<string name="poi_musical_instrument_shop">Musikgeschäft</string>
+	<string name="poi_musical_instrument">Musikgeschäft</string>
 	<string name="poi_nature_reserve">Naturschutzgebiet</string>
 	<string name="poi_neighbourhood">Wohngegend</string>
-	<string name="poi_newsagent_shop">Nachrichtenagentur</string>
-	<string name="poi_newspaper_office">Zeitungsbüro</string>
+	<string name="poi_newsagent">Nachrichtenagentur</string>
+	<string name="poi_newspaper">Zeitungsbüro</string>
 	<string name="poi_ngo">NGO</string>
 	<string name="poi_nightclub">Nachtclub</string>
 	<string name="poi_nursing_home">Altenpflegeheim</string>
 	<string name="poi_observatory">Sternwarte</string>
 	<string name="poi_occupational_therapist">Ergotherapeut</string>
-	<string name="poi_optician">Optiker</string>
+	<string name="poi_craft_optician">Optiker</string>
 	<string name="poi_optician_shop">Optiker</string>
 	<string name="poi_optometrist">Optiker</string>
 	<string name="poi_orchard">Obstplantage</string>
-	<string name="poi_organic_shop">Biolebensmittel</string>
+	<string name="poi_organic">Biolebensmittel</string>
 	<string name="poi_orienteering">Orientierungslauf</string>
-	<string name="poi_outdoor_shop">Outdoor-Geschäft</string>
+	<string name="poi_outdoor">Outdoor-Geschäft</string>
 	<string name="poi_paddle_tennis">Tischtennis</string>
-	<string name="poi_paint_shop">Lackiererei</string>
-	<string name="poi_painter">Maler</string>
+	<string name="poi_paint">Lackiererei</string>
+	<string name="poi_craft_painter">Maler</string>
 	<string name="poi_palaeontological_site">Paläontologischer Ort</string>
 	<string name="poi_paragliding">Gleitschirmfliegen</string>
 	<string name="poi_park">Park</string>
 	<string name="poi_parking">Parkplatz</string>
 	<string name="poi_parking_entrance">Parkeinfahrt</string>
-	<string name="poi_parquet_layer">Parkettläger</string>
+	<string name="poi_craft_parquet_layer">Parkettläger</string>
 	<string name="poi_pawnbroker">Pfandleiher</string>
 	<string name="poi_peak">Berggipfel</string>
 	<string name="poi_pelota">Pelota</string>
 	<string name="poi_pension_fund">Pensionskasse</string>
-	<string name="poi_pet_shop">Tierhandlung</string>
+	<string name="poi_pet">Tierhandlung</string>
 	<string name="poi_petroleum_well">Ölbohrung</string>
 	<string name="poi_pharmacy">Apotheke</string>
-	<string name="poi_photographer">Fotograf</string>
-	<string name="poi_photographic_laboratory">Fotolabor</string>
+	<string name="poi_craft_photographer">Fotograf</string>
+	<string name="poi_craft_photographic_laboratory">Fotolabor</string>
 	<string name="poi_physiotherapist">Physiotherapeut</string>
 	<string name="poi_picnic_site">Picknick</string>
 	<string name="poi_pier">Kai</string>
@@ -364,22 +364,22 @@
 	<string name="poi_place_allotments">Kleingartensiedlung</string>
 	<string name="poi_place_farm">Farm</string>
 	<string name="poi_place_of_worship">Kultstätte</string>
-	<string name="poi_place_of_worship_buddhist">Buddhistische Kultstätte</string>
-	<string name="poi_place_of_worship_christian">Christliche Kultstätte</string>
-	<string name="poi_place_of_worship_hindu">Hinduistische Kultstätte</string>
-	<string name="poi_place_of_worship_jewish">Jüdische Kultstätte</string>
-	<string name="poi_place_of_worship_muslim">Muslimische Kultstätte</string>
-	<string name="poi_place_of_worship_shinto">Shintoistische Kultstätte</string>
-	<string name="poi_place_of_worship_sikh">Sikh Kultstätte</string>
-	<string name="poi_place_of_worship_taoist">Taoistische Kultstätte</string>
-	<string name="poi_plasterer">Stuckateur</string>
+	<string name="poi_religion_buddhist">Buddhistische Kultstätte</string>
+	<string name="poi_religion_christian">Christliche Kultstätte</string>
+	<string name="poi_religion_hindu">Hinduistische Kultstätte</string>
+	<string name="poi_religion_jewish">Jüdische Kultstätte</string>
+	<string name="poi_religion_muslim">Muslimische Kultstätte</string>
+	<string name="poi_religion_shinto">Shintoistische Kultstätte</string>
+	<string name="poi_religion_sikh">Sikh Kultstätte</string>
+	<string name="poi_religion_taoist">Taoistische Kultstätte</string>
+	<string name="poi_craft_plasterer">Stuckateur</string>
 	<string name="poi_playground">Spielplatz</string>
-	<string name="poi_plumber">Installateur</string>
+	<string name="poi_craft_plumber">Installateur</string>
 	<string name="poi_podiatrist">Fußpfleger</string>
 	<string name="poi_police">Polizei</string>
 	<string name="poi_post_box">Briefkasten</string>
 	<string name="poi_post_office">Post</string>
-	<string name="poi_pottery_craft">Töpferei</string>
+	<string name="poi_craft_pottery">Töpferei</string>
 	<string name="poi_power_generator">Stromerzeuger</string>
 	<string name="poi_power_plant">Kraftwerk</string>
 	<string name="poi_power_substation">Umspannstation</string>
@@ -396,7 +396,7 @@
 	<string name="poi_quarry">Steinbruch</string>
 	<string name="poi_raceway">Gerinne</string>
 	<string name="poi_racquet">Schläger</string>
-	<string name="poi_radiotechnics_shop">Radiotechniker</string>
+	<string name="poi_radiotechnics">Radiotechniker</string>
 	<string name="poi_railway_halt">Eisenbahnhaltestelle (obsolet)</string>
 	<string name="poi_railway_platform">Bahnsteig (obsolet)</string>
 	<string name="poi_railway_station">Bahnhof (obsolet)</string>
@@ -404,32 +404,32 @@
 	<string name="poi_recycling">Abfallverwertung</string>
 	<string name="poi_reef">Riff</string>
 	<string name="poi_register_office">Standesamt</string>
-	<string name="poi_research_office">Forschungszentrum</string>
+	<string name="poi_research">Forschungszentrum</string>
 	<string name="poi_resort">Urlaubsort</string>
 	<string name="poi_restaurant">Restaurant</string>
 	<string name="poi_ridge">Bergrücken</string>
-	<string name="poi_rigger">Ausleger</string>
+	<string name="poi_craft_rigger">Ausleger</string>
 	<string name="poi_river">Fluß</string>
 	<string name="poi_roller_skating">Rollschuhe</string>
-	<string name="poi_roofer">Dachdecker</string>
+	<string name="poi_craft_roofer">Dachdecker</string>
 	<string name="poi_rowing">Rudersport</string>
 	<string name="poi_rugby_league">Rugbyliga</string>
 	<string name="poi_rugby_union">Rugbyvereinigung</string>
-	<string name="poi_ruins_historic">Historische Ruine</string>
+	<string name="poi_historic_ruins">Historische Ruine</string>
 	<string name="poi_rune_stone">Runenstein</string>
 	<string name="poi_running_track">Laufstrecke</string>
 	<string name="poi_runway">Start-/Landebahn</string>
 	<string name="poi_saddle">Sattel</string>
-	<string name="poi_saddler">Sattler</string>
-	<string name="poi_sailmaker">Segelmacher</string>
+	<string name="poi_craft_saddler">Sattler</string>
+	<string name="poi_craft_sailmaker">Segelmacher</string>
 	<string name="poi_salt_pond">Salzteich</string>
 	<string name="poi_sanatorium">Sanatorium</string>
 	<string name="poi_sauna">Sauna</string>
-	<string name="poi_sawmill">Sägewerk</string>
-	<string name="poi_scaffolder">Gerüstbauer</string>
+	<string name="poi_craft_sawmill">Sägewerk</string>
+	<string name="poi_craft_scaffolder">Gerüstbauer</string>
 	<string name="poi_school">Schule</string>
 	<string name="poi_scuba_diving">Sporttauchen</string>
-	<string name="poi_sculptor">Bildhauer</string>
+	<string name="poi_craft_sculptor">Bildhauer</string>
 	<string name="poi_seafood">Meeresfrüchte</string>
 	<string name="poi_seamark_anchor_berth">Ankerplatz</string>
 	<string name="poi_seamark_anchorage">Ankerplatz</string>
@@ -475,11 +475,11 @@
 	<string name="poi_second_hand">Gebrauchtwaren</string>
 	<string name="poi_service_tyres">Reifenhändler</string>
 	<string name="poi_ses_station">SES-Station</string>
-	<string name="poi_sewing_shop">Textilwaren</string>
+	<string name="poi_sewing">Textilwaren</string>
 	<string name="poi_shelter">Schutzraum</string>
 	<string name="poi_ship_chandler">Schiffsausrüster</string>
-	<string name="poi_ship_historic">Historisches Schiff</string>
-	<string name="poi_shoemaker">Schuster</string>
+	<string name="poi_historic_ship">Historisches Schiff</string>
+	<string name="poi_craft_shoemaker">Schuster</string>
 	<string name="poi_shoes">Schuhgeschäft</string>
 	<string name="poi_shooting">Schießbude</string>
 	<string name="poi_shop_farm">Landwirtschaft</string>
@@ -495,52 +495,52 @@
 	<string name="poi_speech_therapist">Sprachtherapeut</string>
 	<string name="poi_speed_camera">Blitzgerät</string>
 	<string name="poi_sports_centre">Sportzentrum</string>
-	<string name="poi_sports_shop">Sportartikel</string>
+	<string name="poi_sports">Sportartikel</string>
 	<string name="poi_spring">Quelle</string>
 	<string name="poi_stadium">Stadion</string>
-	<string name="poi_stand_builder">Baumeister</string>
+	<string name="poi_craft_stand_builder">Baumeister</string>
 	<string name="poi_standpipe">Brunnen</string>
-	<string name="poi_stationery_shop">Bürobedarf</string>
+	<string name="poi_stationery">Bürobedarf</string>
 	<string name="poi_stone">Auffallender Stein</string>
-	<string name="poi_stonemason">Steinmetz</string>
+	<string name="poi_craft_stonemason">Steinmetz</string>
 	<string name="poi_strait">Straße</string>
 	<string name="poi_stream">Fluss</string>
 	<string name="poi_stripclub">Stripclub</string>
 	<string name="poi_studio">Studio</string>
 	<string name="poi_suburb">Vorstadt</string>
-	<string name="poi_subway_entrance">U-Bahnhofeingang</string>
+	<string name="poi_railway_subway_entrance">U-Bahnhofeingang</string>
 	<string name="poi_subway_station">U-Bahnhof</string>
-	<string name="poi_sun_protection_craft">Lichtschutz</string>
+	<string name="poi_craft_sun_protection">Lichtschutz</string>
 	<string name="poi_supermarket">Supermarkt</string>
 	<string name="poi_surveillance">Überwachung</string>
 	<string name="poi_survey_point">Messstation</string>
-	<string name="poi_sweep">Kaminkehrer</string>
+	<string name="poi_craft_sweep">Kaminkehrer</string>
 	<string name="poi_swimming">Schwimmen</string>
 	<string name="poi_swimming_pool">Schwimmbecken</string>
 	<string name="poi_table_tennis">Tischtennis</string>
-	<string name="poi_tableware_shop">Tischgeschirr</string>
-	<string name="poi_tailor">Schneider</string>
+	<string name="poi_tableware">Tischgeschirr</string>
+	<string name="poi_craft_tailor">Schneider</string>
 	<string name="poi_tattoo">Tattoo-Studio</string>
 	<string name="poi_tax_inspection">Steuerprüfung</string>
 	<string name="poi_taxi">Taxi-Stand</string>
-	<string name="poi_telecommunication_office">Fernmeldeamt</string>
+	<string name="poi_office_telecommunication">Fernmeldeamt</string>
 	<string name="poi_telephone">Telefon</string>
 	<string name="poi_telephone_exchange">Fernsprechamt</string>
 	<string name="poi_tennis">Tennis</string>
 	<string name="poi_theatre">Theater</string>
 	<string name="poi_theme_park">Vergnügungspark</string>
-	<string name="poi_ticket_shop">Ticket-Shop</string>
-	<string name="poi_tiler">Dachdecker</string>
-	<string name="poi_tinsmith">Klempner</string>
-	<string name="poi_tobacco_shop">Trafik</string>
+	<string name="poi_ticket">Ticket-Shop</string>
+	<string name="poi_craft_tiler">Dachdecker</string>
+	<string name="poi_craft_tinsmith">Klempner</string>
+	<string name="poi_tobacco">Trafik</string>
 	<string name="poi_toboggan">Rodelschlitten</string>
 	<string name="poi_toilets">Toilette</string>
 	<string name="poi_toll_booth">Mautstelle</string>
-	<string name="poi_tourism_information">Fremdenverkehrsamt</string>
+	<string name="poi_information">Fremdenverkehrsamt</string>
 	<string name="poi_town">Kleinstadt</string>
 	<string name="poi_town_hall">Rathaus</string>
-	<string name="poi_toys_shop">Spielwarenhandlung</string>
-	<string name="poi_trade_shop">Geschäftszentrum</string>
+	<string name="poi_toys">Spielwarenhandlung</string>
+	<string name="poi_trade">Geschäftszentrum</string>
 	<string name="poi_traffic_calming_bump">Bodenwelle</string>
 	<string name="poi_traffic_calming_chicane">Schikane</string>
 	<string name="poi_traffic_calming_choker">Fahrbahnverengung</string>
@@ -554,14 +554,14 @@
 	<string name="poi_tunnel">Tunnel</string>
 	<string name="poi_turning_circle">Wendehammer</string>
 	<string name="poi_university">Universität</string>
-	<string name="poi_upholsterer">Tapezierer</string>
-	<string name="poi_vacuum_cleaner_shop">Staubsauger</string>
+	<string name="poi_craft_upholsterer">Tapezierer</string>
+	<string name="poi_vacuum_cleaner">Staubsauger</string>
 	<string name="poi_variety_store">Kleinkaufhaus</string>
 	<string name="poi_vehicle_inspection">Fahrzeugkontrolle</string>
 	<string name="poi_vehicle_ramp">Fahrzeugrampe</string>
 	<string name="poi_vending_machine">Verkaufsautomat</string>
 	<string name="poi_veterinary">Tierarzt</string>
-	<string name="poi_video_shop">Videothek</string>
+	<string name="poi_video">Videothek</string>
 	<string name="poi_viewpoint">Aussichtspunkt</string>
 	<string name="poi_village">Dorf</string>
 	<string name="poi_vineyard">Weinberg</string>
@@ -570,7 +570,7 @@
 	<string name="poi_waste_basket">Mülleimer</string>
 	<string name="poi_waste_disposal">Deponie</string>
 	<string name="poi_wastewater_plant">Abwasseranlage</string>
-	<string name="poi_watchmaker">Uhrmacher</string>
+	<string name="poi_craft_watchmaker">Uhrmacher</string>
 	<string name="poi_water_mill">Wassermühle</string>
 	<string name="poi_water_park">Wasserpark</string>
 	<string name="poi_water_tower">Wasserturm</string>
@@ -583,8 +583,8 @@
 	<string name="poi_weir">Stauanlage</string>
 	<string name="poi_wetland">Aue</string>
 	<string name="poi_windmill">Windmühle</string>
-	<string name="poi_window_blind_shop">Rollvorhang</string>
-	<string name="poi_window_construction">Fensterbau</string>
+	<string name="poi_window_blind">Rollvorhang</string>
+	<string name="poi_craft_window_construction">Fensterbau</string>
 	<string name="poi_works">Anlage</string>
 	<string name="poi_wreck">Schiffswrack</string>
 	<string name="poi_zoo">Zoo</string>
@@ -598,7 +598,7 @@
 	<string name="poi_dock">Dock</string>
 	<string name="poi_amusement_ride">Vergnügungsfahrt</string>
 	<string name="poi_attraction_animal">Tiere (Attraktion)</string>
-	<string name="poi_ferris_wheel">Riesenrad</string>
+	<string name="poi_big_wheel">Riesenrad</string>
 	<string name="poi_carousel">Karussell</string>
 	<string name="poi_maze">Labyrinth</string>
 	<string name="poi_roller_coaster">Achterbahn</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index acbc6df482..0da878d61d 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="btn_add_tag">Προσθήκη Ετικέτας</string>
     <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
@@ -167,7 +167,7 @@
 	<string name="rendering_attr_hmRendered_description">Αύξηση ποσότητας των λεπτομερειών του χάρτη</string>
 	<string name="rendering_attr_hmRendered_name">Εμφάνιση περισσότερων λεπτομερειών χάρτη</string>
 	<string name="local_index_routing_data">Δεδομένα δρομολόγησης</string>
-	<string name="navigate_point_format">Μορφή:</string>
+	<string name="navigate_point_format">Μορφή</string>
 	<string name="poi_search_desc">Αναζήτηση ΣΕ (σημείο ενδιαφέροντος)</string>
 	<string name="address_search_desc">Αναζήτηση διεύθυνσης</string>
 	<string name="navpoint_search_desc">Συντεταγμένες</string>
@@ -841,7 +841,7 @@
 	<string name="search_online_address">Διαδίκτυο</string>
 	<string name="max_level_download_tile">Μεγ. online κλίμακα</string>
 	<string name="max_level_download_tile_descr">Επιλέξτε τη μέγιστη κλίμακα προς λήψη για τα πλακίδια του online χάρτη</string>
-	<string name="route_general_information">Συνολική απόσταση %1$s,\n χρόνος ταξιδιού %2$d ω %3$d λ.</string>
+	<string name="route_general_information">Συνολική απόσταση %1$s, χρόνος ταξιδιού %2$d ω %3$d λ.</string>
 	<string name="router_service_descr">Επιλέξτε μια online ή offline υπηρεσία πλοήγησης</string>
 	<string name="router_service">Υπηρεσία πλοήγησης</string>
 	<string name="sd_dir_not_accessible">Η κατάλογος αποθήκευσης δεδομένων στην SD κάρτα δεν είναι προσβάσιμος!</string>
@@ -1686,10 +1686,10 @@
 	<string name="shared_string_add">Προσθήκη</string>
 	<string name="shared_string_import">Εισαγωγή</string>
 	<string name="shared_string_export">Εξαγωγή</string>
-	<string name="shared_string_more">Περισσότερα</string>
+	<string name="shared_string_more">Περισσότερα…</string>
 	<string name="shared_string_download">Λήψη</string>
 	<string name="shared_string_download_successful">Επιτυχής λήψη</string>
-	<string name="shared_string_action_template">"Ενέργεια {0}: "</string>
+	<string name="shared_string_action_template">Ενέργεια {0}</string>
 	<string name="shared_string_close">Κλείσιμο</string>
 	<string name="shared_string_exit">Έξοδος</string>
 	<string name="shared_string_show">Εμφάνιση</string>
@@ -1706,4 +1706,12 @@
 	<string name="shared_string_video">Εικόνα</string>
 	<string name="shared_string_photo">Φωτογραφία</string>
 
+	<string name="osmand_parking_time_left">Αριστερά</string> <string name="your_edits">Η Επεξεργασίες σου</string>
+    <string name="waypoint_visit_after">Επίσκεψη μετά</string>
+    <string name="waypoint_visit_before">Επίσκεψη πριν</string>
+    <string name="routing_settings_2">Ρυθμίσεις πλοήγησης</string>
+    <string name="general_settings_2">Γενικές ρυθμίσεις</string>
+	<string name="shared_string_deselect_all">Αποεπιλογή όλων</string>
+	<string name="shared_string_collapse">Κατάρρευση</string>
+	<string name="route_points">Σημεία δρομολογίου</string>
 	</resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 99319e54d4..a58f44c539 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
   
   <string name="layer_map_appearance">Configura pantalla</string>
   <string name="show_lanes">Mostrar carriles</string>
@@ -166,7 +167,7 @@
   <string name="show_more_map_detail_descr">Muestra detalles del mapa vectorial (carreteras, etc.) a niveles inferiores de acercamiento</string>
   <string name="favourites_delete_multiple_succesful">Punto(s) favorito(s) correctamente borrado(s).</string>
   <string name="favorite_delete_multiple">Va a borrar %1$d favorito(s) y %2$d grupo(s) de favoritos. ¿Está seguro?</string>
-  <string name="favorite_home_category">Casa</string>
+  <string name="favorite_home_category">Inicio</string>
   <string name="favorite_friends_category">Amigos</string>
   <string name="favorite_places_category">Lugares</string>
   <string name="favorite_default_category">Otros</string>
@@ -179,7 +180,7 @@
   
   
   
-  <string name="local_index_installed">Edición</string>
+  <string name="local_index_installed">Versión local</string>
   <string name="local_index_items_backuped">%1$d de %2$d elemento(s) correctamente desactivado(s).</string>
   <string name="local_index_items_deleted">%1$d de %2$d elemento(s) correctamente borrado(s).</string>
   <string name="local_index_items_restored">%1$d de %2$d elemento(s) correctamente activado(s).</string>
@@ -371,7 +372,7 @@
   <string name="loading_builds">Cargando compilaciones OsmAnd…</string>
   <string name="select_build_to_install">Seleccione una de las compilaciones OsmAnd a instalar</string>
   <string name="contribution_activity">Actividad especial para versión de donación</string>
-  <string name="gps_status_app_not_found">La aplicación GPS Status no está instalada. ¿Buscar en G. Play?</string>
+  <string name="gps_status_app_not_found">La aplicación GPS status no está instalada. ¿Buscar en la tienda?</string>
   <string name="voice_is_not_available_msg">Las indicaciones de voz no están disponibles, vaya a \'Opciones\' → \'General\' → \'Indicaciones de voz\' y elija o descargue un paquete de mensajes de voz.</string>
   <string name="voice_is_not_available_title">No se han seleccionado indicaciones por voz</string>
   <string name="daynight_mode_day">Día</string>
@@ -500,7 +501,7 @@
   <string name="route_head">Cabecera</string>
   <string name="first_time_continue">Después</string>
   <string name="first_time_download">Descargar regiones</string>
-  <string name="first_time_msg">Gracias por usar OsmAnd. Para muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
+  <string name="first_time_msg">Gracias por usar OsmAnd. Para muchas características de la aplicación necesita algunos datos regionales que puede descargar a través de \'Opciones\' → \'Gestionar mapas\'. Entonces podrá ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
   <string name="search_poi_location">Buscando señal…</string>
   <string name="search_near_map">Buscar cerca del centro del mapa</string>
   <string name="search_nearby">Buscar cercanos</string>
@@ -552,7 +553,7 @@
   <string name="search_online_address">Búsqueda en línea</string>
   <string name="max_level_download_tile">Máx. acercamiento con conexión</string>
   <string name="max_level_download_tile_descr">Elige el nivel de acercamiento máximo para descargar teselas de mapas con conexión</string>
-  <string name="route_general_information">Distancia total %1$s,\n tiempo de viaje %2$d h %3$d m.</string>
+  <string name="route_general_information">Distancia total %1$s,\ntiempo de viaje %2$d h %3$d m.</string>
   <string name="router_service_descr">Elige un servicio de navegación con o sin conexión</string>
   <string name="router_service">Servicio de navegación</string>
   <string name="sd_dir_not_accessible">¡No se puede acceder a la carpeta de almacenamiento en la tarjeta SD!</string>
@@ -767,11 +768,11 @@
   <string name="online_map_settings_descr">Configurar fuentes de mapas en línea o teselas guardadas</string>
   
   
-  <string name="osmand_rastermaps_plugin_description">"Con este plugin puedes acceder a muchos tipos de mapas en línea (llamados de teselas o raster), desde teselas de Openstreetmap predefinidas (como Mapnik) a imágenes de satélite y capas de propósito especial  como mapas climáticos, mapas atmosféricos, mapas geológicos, capas de sombreado, etc..
-\n\nCualquiera de estos mapas puede ser utilizado bien como el mapa principal (base) que se mostrará en la pantalla del mapa de OsmAnd, o como una capa superior o inferior a otro mapa base (como mapas en línea regulares de OsmAnd). Para hacer los mapas subyacentes más visibles, ciertos elementos de los mapas vectoriales OsmAnd se pueden ocultar fácilmente a través del menú \'Configurar mapa\' como se desee.
+  <string name="osmand_rastermaps_plugin_description">"Con este extra puede acceder a muchos tipos de mapas en línea (llamados teselas o raster), desde teselas de Openstreetmap predefinidas (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas climáticos, mapas atmosféricos, mapas geológicos, capas de sombreado, etc.
+\n\nCualquiera de estos mapas puede ser utilizado como el mapa principal (base) que se mostrará en la pantalla del mapa de OsmAnd, o como una capa superior o inferior a otro mapa base (como mapas en línea regulares de OsmAnd). Para hacer los mapas subyacentes más visibles, ciertos elementos de los mapas vectoriales OsmAnd se pueden ocultar fácilmente a través del menú \'Configurar mapa\' como se desee.
 \n\nLos mapas de teselas pueden obtenerse directamente a través de fuentes en línea, o pueden ser preparados para su uso fuera de línea (y copiarse manualmente en la carpeta de datos de OsmAnd) como una base de datos sqlite que puede producirse por una variedad de herramientas de preparación de mapas de terceros. "</string>
   <string name="osmand_background_plugin_description">Muestra las configuraciones para habilitar el seguimiento y la navegación en modo suspensión (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
-  <string name="osmand_accessibility_description">Muestra las opciones para activar las características especiales de accesibilidad.</string>
+  <string name="osmand_accessibility_description">Este extra habilita la característica de accesibilidad del dispositivo directamente en OsmAnd, y facilita por ejemplo, el ajuste de la velocidad de la voz para voces TTS, la configuración de navegación de pantalla direccional-pad, usando la rueda de desplazamiento para el control de acercamiento, o el uso de comentarios de conversión de texto a voz.</string>
   
   
   
@@ -862,7 +863,7 @@
   <string name="accessibility_preferences_descr">Preferencias de accesibilidad</string>
   <string name="accessibility_preferences">Accesibilidad</string>
   <string name="local_index_routing_data">Datos de enrutamiento</string>
-  <string name="navigate_point_format">Formato :</string>
+  <string name="navigate_point_format">Formato</string>
   <string name="poi_search_desc">Buscar PDI (Punto De Interes)</string>
   <string name="address_search_desc">Buscar dirección</string>
   <string name="navpoint_search_desc">Coordenadas</string>
@@ -1079,7 +1080,7 @@
     <string name="download_srtm_maps">Curvas de nivel</string>
     
 	
-<string name="audionotes_plugin_description">Este extra proporciona la funcionalidad y los botones para tomar notas de audio/fotografía/video durante un viaje</string>
+<string name="audionotes_plugin_description">El extra de notas de audio/vídeo proporciona la funcionalidad para tomar notas de audio/fotografía/vídeo durante un viaje, ya sea utilizando un botón en la pantalla del mapa, o directamente el menú contextual para cualquier posición en el mapa.</string>
     <string name="audionotes_plugin_name">Extra de notas de audio</string>
     <string name="osmand_srtm_short_description_80_chars">Extra OsmAnd para curvas de nivel sin conexión</string>
     <string name="osmand_srtm_long_description_1000_chars">"Este extra proporciona una superposición de curvas de nivel que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje.\n\nLos datos globales (entre 70 grados norte y 70 grados sur) se basan en mediciones realizadas por SRTM (Shuttle Radar Topography Mission, Misión de Topografía por Radar desde Transbordador) y ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer, Radiómetro Espacial Avanzado de Emisión Térmica y Reflexión), un instrumento de imágenes a bordo de Terra, el satélite insignia del Sistema de Observación de la Tierra de la NASA. ASTER es un esfuerzo cooperativo entre la NASA, el Ministerio de Economía, Comercio e Industria de Japón (METI) y Sistemas Espaciales de Japón (J-spacesystems). "</string>
@@ -1249,7 +1250,7 @@
     <string name="download_using_mobile_internet">El Wi-Fi no está conectado en este momento. ¿Desea usar la conexión actual a Internet para descargar?</string>
     <string name="local_indexes_cat_srtm">Datos de curvas de nivel</string>
     <string name="wait_current_task_finished">Espere hasta que termine la tarea actual</string>
-    <string name="shared_string_downloading">Descargando…</string>
+    <string name="shared_string_downloading">Descargando</string>
 	<string name="destination_point">Destino %1$s</string>
     <string name="context_menu_item_destination_point">Fijar como destino</string>
     <string name="please_select_address">Selecciona ciudad o calle primero</string>
@@ -1483,8 +1484,8 @@
     <string name="keep_and_add_destination_point">Añadir como punto de destino</string>
     <string name="select_gpx">Seleccionar GPX…</string>
     <string name="route_descr_select_destination">Seleccionar destino</string>
-    <string name="shared_string_select_on_map">Seleccionar en el mapa…</string>
-    <string name="shared_string_favorite">Favorito…</string>
+    <string name="shared_string_select_on_map">Seleccionar en el mapa</string>
+    <string name="shared_string_favorite">Favorito</string>
     <string name="route_preferences">Preferencias de la ruta</string>
     <string name="route_info">Información de la ruta</string>
     <string name="tip_recent_changes_1_7_1_t">"Cambios en 1.7:
@@ -1789,7 +1790,7 @@
     <string name="duration">Duración</string>
     <string name="distance">Distancia</string>
     <string name="record_plugin_name">Grabación de viaje</string>
-    <string name="record_plugin_description">"Este extra activa la funcionalidad para registrar y guardar tus trazas o bien manualmente tocando el control de registro GPX en la pantalla del mapa o bien automáticamente registrando todas tus rutas seguidas en un archivo GPX.\n\nLas trazas registradas puedes compartirlas con tus amigos o usarlas como contibuciones a OSM. Los atletas pueden utilizarlas para monitorizar sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente con OsmAnd como tiempos, velocidad media, etc., y por supuesto pueden analizarse posteriormente con herramientas de análisis de terceros. "</string>
+    <string name="record_plugin_description">"Este extra activa la funcionalidad para registrar y guardar sus trazas manualmente tocando el control de registro GPX en la pantalla del mapa, o automáticamente registrando todas tus rutas seguidas en un archivo GPX.\n\nLas trazas registradas puede compartirlas con sus amigos o usarlas como contibuciones a OSM. Los atletas pueden utilizarlas para monitorizar sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente con OsmAnd como tiempos, velocidad media, etc., y por supuesto pueden analizarse posteriormente con herramientas de análisis de terceros. "</string>
     <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús y lanzadera</string>
 	<string name="save_track_to_gpx_globally">Guardar traza en fichero GPX</string>
 	<string name="save_track_interval_globally">Intervalo de guardado</string>
@@ -1874,7 +1875,7 @@
     <string name="rendering_attr_roadStyle_name">Estilo de carretera</string>
     <string name="rendering_value_default_name">Predeterminado</string>
     <string name="rendering_value_orange_name">Naranja</string>
-    <string name="routing_attr_no_new_routing_name">Sin reglas de ruteo de v1.9</string>
+    <string name="routing_attr_no_new_routing_name">Sin reglas de ruteo v1.9</string>
     <string name="routing_attr_no_new_routing_description">No usar reglas de ruteo introducidas en v.1.9</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlas de carreteras alemanas</string>
 	<string name="traffic_warning_railways">Cruce de ferrocarril</string>
@@ -1901,7 +1902,7 @@
 	<string name="proxy_host_descr">Configura el hostname de tu proxy (p.e. 127.0.0.1)</string>
 	<string name="version_settings_descr">Descargar versiones de desarrollo (nightly builds)</string>
     <string name="version_settings">Compilaciones</string>
-    <string name="gps_status">Estado GPS</string>
+    <string name="gps_status">GPS status</string>
     <string name="rendering_attr_streetLighting_name">Alumbrado público</string>
     <string name="points">Puntos</string>
     <string name="tracks">Trazas</string>
@@ -1924,8 +1925,8 @@
 	<string name="get_plugin">Obtener</string>
 <string name="free">"Libre %1$s "</string>
 	<string name="device_memory">Memoria del dispositivo</string>
-    <string name="rendering_attr_pisteRoutes_name">Rutas de pista</string>
-	<string name="rendering_attr_pisteGrooming_name">Arreglo de pista</string>
+    <string name="rendering_attr_pisteRoutes_name">Pista de rutas</string>
+	<string name="rendering_attr_pisteGrooming_name">Pista de entrenamiento</string>
     <string name="roads_only">Sólo carreteras</string>
     <string name="share_note">Compartir nota</string>
 	
@@ -1960,4 +1961,28 @@
 	<string name="shared_string_selected">Seleccionada(s)</string>
 	<string name="track_segments">Segmentos de traza</string>
 	<string name="track_points">Puntos de traza</string>
-	</resources>
\ No newline at end of file
+	<string name="action_create">Acción crear</string>
+	<string name="action_modify">Acción modificar</string>
+	<string name="action_delete">Acción borrar</string>
+	<string name="osm_edits">Ediciones OSM</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Izquierda</string> <string name="parking_place_limited">Aparcamiento de tiempo limitado</string>
+	<string name="your_edits">Tus ediciones</string>
+    <string name="waypoint_visit_after">Visitar después</string>
+    <string name="waypoint_visit_before">Visitar antes</string>
+    <string name="simulate_your_location">Simular tu ubicación</string>
+    <string name="drawer">Lista plana</string>
+    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
+    <string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string>
+    <string name="routing_settings_2">Opciones de navegación</string>
+    <string name="general_settings_2">Opciones generales</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_deselect">Deseleccionar</string>
+	<string name="shared_string_deselect_all">Deseleccionar todo</string>
+	<string name="shared_string_unexpected_error">Ocurrió un error inesperado</string>
+	<string name="shared_string_action_template">Acción {0}</string>
+	<string name="shared_string_collapse">Colapsar</string>
+	<string name="shared_string_video">Vídeo</string>
+	<string name="shared_string_photo">Foto</string>
+	<string name="route_points">Puntos de la ruta</string>
+	<string name="shared_string_release">Liberado</string>
+	</resources>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index adfedcd40d..05438f549f 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -19,80 +19,80 @@
 <string name="poi_shop_tea">فروشگاه چای</string>
 <string name="poi_dairy">فروشگاه لبنی</string>
 <string name="poi_vending_machine">دستگاه فروش سکه ای</string>
-<string name="poi_bookshop">کتابفروشی</string>
+<string name="poi_books">کتابفروشی</string>
 
-<string name="poi_bicycle_shop">فروشگاه دوچرخه</string>
-<string name="poi_anime_shop">فروشگاه کارتون</string>
-<string name="poi_antiques_shop">عتیقه فروشی</string>
-<string name="poi_art_shop">فروشگاه هنر</string>
+<string name="poi_bicycle">فروشگاه دوچرخه</string>
+<string name="poi_anime">فروشگاه کارتون</string>
+<string name="poi_antiques">عتیقه فروشی</string>
+<string name="poi_art">فروشگاه هنر</string>
 <string name="poi_baby_goods">سیسمونی</string>
-<string name="poi_bag_shop">فروشگاه کیف</string>
-<string name="poi_bathroom_furnishing_shop">محصولات بهداشتی</string>
-<string name="poi_bed_shop">مبلمان اتاق خواب</string>
+<string name="poi_bag">فروشگاه کیف</string>
+<string name="poi_bathroom_furnishing">محصولات بهداشتی</string>
+<string name="poi_bed">مبلمان اتاق خواب</string>
 <string name="poi_boutique">بوتیک</string>
-<string name="poi_carpet_shop">فروشگاه فرش</string>
-<string name="poi_chemist_shop">فروشگاه مواد مخدر</string>
-<string name="poi_clothes_shop">فروشگاه پوشاک</string>
-<string name="poi_children_clothes_shop">\فروشگاه پوشاک کودکان</string>
+<string name="poi_carpet">فروشگاه فرش</string>
+<string name="poi_chemist">فروشگاه مواد مخدر</string>
+<string name="poi_clothes">فروشگاه پوشاک</string>
+<string name="poi_children_clothes">\فروشگاه پوشاک کودکان</string>
 <string name="poi_shoes">کفش فروشی</string>
-<string name="poi_computer_shop">فروشگاه کامپیوتر</string>
+<string name="poi_computer">فروشگاه کامپیوتر</string>
 <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>
-<string name="poi_curtain_shop">پرده فروشی</string>
-<string name="poi_fabric_shop">پارچه فروشی</string>
-<string name="poi_bedding_shop">پنبه زنی</string>
-<string name="poi_dive_shop">تجهیزات غواصی</string>
-<string name="poi_doityourself_shop">مصالح ساختمانی</string>
-<string name="poi_erotic_shop">لوازم پزشکی</string>
-<string name="poi_fishing_shop">لوازم ماهیگیری</string>
+<string name="poi_curtain">پرده فروشی</string>
+<string name="poi_fabric">پارچه فروشی</string>
+<string name="poi_bedding">پنبه زنی</string>
+<string name="poi_dive">تجهیزات غواصی</string>
+<string name="poi_doityourself">مصالح ساختمانی</string>
+<string name="poi_erotic">لوازم پزشکی</string>
+<string name="poi_fishing">لوازم ماهیگیری</string>
 <string name="poi_florist">گلفروشی</string>
-<string name="poi_frame_shop">قاب سازی</string>
-<string name="poi_furniture_shop">فروشگاه مبلمان</string>
+<string name="poi_frame">قاب سازی</string>
+<string name="poi_furniture">فروشگاه مبلمان</string>
 <string name="poi_garden_centre">لوازم باغبانی</string>
-<string name="poi_gas_shop">فروشگاه کپسول گاز</string>
-<string name="poi_general_shop">فروشگاه عمومی</string>
-<string name="poi_gift_shop">مغازه کادو فروشی</string>
-<string name="poi_glaziery_shop">Glaziery</string>
-<string name="poi_hardware_shop">فروشگاه سخت افزار</string>
-<string name="poi_hearing_aids_shop">لوازم پزشکی سمعک</string>
+<string name="poi_gas">فروشگاه کپسول گاز</string>
+<string name="poi_general">فروشگاه عمومی</string>
+<string name="poi_gift">مغازه کادو فروشی</string>
+<string name="poi_glaziery">Glaziery</string>
+<string name="poi_hardware">فروشگاه سخت افزار</string>
+<string name="poi_hearing_aids">لوازم پزشکی سمعک</string>
 <string name="poi_herbalist">عطاری</string>
-<string name="poi_hifi_shop">فروشگاه لوازم صوتی</string>
-<string name="poi_houseware_shop">فروشگاه لوازم خانگی</string>
-<string name="poi_hunting_shop">تجهیزات شکار</string>
-<string name="poi_interior_decoration_shop">فروشگاه دکوراسیون داخلی</string>
-<string name="poi_jewelry_shop">طلا فروشی</string>
+<string name="poi_hifi">فروشگاه لوازم صوتی</string>
+<string name="poi_houseware">فروشگاه لوازم خانگی</string>
+<string name="poi_hunting">تجهیزات شکار</string>
+<string name="poi_interior_decoration">فروشگاه دکوراسیون داخلی</string>
+<string name="poi_jewelry">طلا فروشی</string>
 <string name="poi_kiosk">دکه</string>
-<string name="poi_kitchen_shop">ظروف اشپزخانه</string>
-<string name="poi_mobile_phone_shop">فروشگاه موبایل</string>
-<string name="poi_motorcycle_shop">فروشگاه موتور سیکلت</string>
-<string name="poi_musical_instrument_shop">فروشگاه لوزم موسیقی</string>
-<string name="poi_newsagent_shop">روزنامه فروشی</string>
+<string name="poi_kitchen">ظروف اشپزخانه</string>
+<string name="poi_mobile_phone">فروشگاه موبایل</string>
+<string name="poi_motorcycle">فروشگاه موتور سیکلت</string>
+<string name="poi_musical_instrument">فروشگاه لوزم موسیقی</string>
+<string name="poi_newsagent">روزنامه فروشی</string>
 <string name="poi_optician_shop">عینک سازی</string>
-<string name="poi_organic_shop">مواد غذایی الی</string>
-<string name="poi_outdoor_shop">بازار روز</string>
-<string name="poi_paint_shop">رنگ فروشی</string>
-<string name="poi_pet_shop">فروشگاه حیوانات خانگی</string>
-<string name="poi_radiotechnics_shop">فروشگاه لوازم رادیویی</string>
+<string name="poi_organic">مواد غذایی الی</string>
+<string name="poi_outdoor">بازار روز</string>
+<string name="poi_paint">رنگ فروشی</string>
+<string name="poi_pet">فروشگاه حیوانات خانگی</string>
+<string name="poi_radiotechnics">فروشگاه لوازم رادیویی</string>
 <string name="poi_second_hand">سمساری</string>
 <string name="poi_ship_chandler">کشتی</string>
-<string name="poi_sports_shop">لوازم ورزشی</string>
-<string name="poi_stationery_shop">فروشگاه لوازم التحریر</string>
-<string name="poi_tableware_shop">فروشگاه کارد و چنگال</string>
-<string name="poi_ticket_shop">فروشگاه بلیط</string>
-<string name="poi_tobacco_shop">دخانیات</string>
-<string name="poi_toys_shop">اسباب بازی فروشی</string>
-<string name="poi_trade_shop">باربری</string>
-<string name="poi_vacuum_cleaner_shop">فروشگاه جاروبرقی</string>
+<string name="poi_sports">لوازم ورزشی</string>
+<string name="poi_stationery">فروشگاه لوازم التحریر</string>
+<string name="poi_tableware">فروشگاه کارد و چنگال</string>
+<string name="poi_ticket">فروشگاه بلیط</string>
+<string name="poi_tobacco">دخانیات</string>
+<string name="poi_toys">اسباب بازی فروشی</string>
+<string name="poi_trade">باربری</string>
+<string name="poi_vacuum_cleaner">فروشگاه جاروبرقی</string>
 <string name="poi_variety_store">فروشگاه کوچک</string>
-<string name="poi_video_shop">کلوب فیلم</string>
-<string name="poi_window_blind_shop">در و پنجره سازی</string>
+<string name="poi_video">کلوب فیلم</string>
+<string name="poi_window_blind">در و پنجره سازی</string>
 <string name="poi_department_store">بخش فروش</string>
-<string name="poi_electronics_shop">فروشگاه های لوازم الکترونیکی</string>
+<string name="poi_electronics">فروشگاه های لوازم الکترونیکی</string>
 <string name="poi_car_shop">فروشگاه ماشین</string>
 <string name="poi_car_parts_shop">فروشگاه قطعات خودرو</string>
-<string name="poi_atv_shop">Quad store</string>
-<string name="poi_cosmetics_shop">آرایشی و بهداشتی</string>
+<string name="poi_atv">Quad store</string>
+<string name="poi_cosmetics">آرایشی و بهداشتی</string>
 <string name="poi_marketplace">بازار</string>
-<string name="poi_sewing_shop">محصولات خشک فروشگاه</string>
+<string name="poi_sewing">محصولات خشک فروشگاه</string>
 
 <string name="poi_police">پلیس</string>
 <string name="poi_fire_station">آتش نشانی</string>
@@ -147,7 +147,7 @@
 <string name="poi_railway_station">ایستگاه راه آهن (منسوخ)</string>
 <string name="poi_railway_platform">پلت فرم راه آهن (منسوخ)</string>
 <string name="poi_railway_halt">ایستگاه راه آهن (منسوخ)</string>
-<string name="poi_subway_entrance">ورودی مترو</string>
+<string name="poi_railway_subway_entrance">ورودی مترو</string>
 <string name="poi_subway_station">ایستگاه مترو</string>
 <string name="poi_taxi">ایستگاه تاکسی</string>
 
@@ -246,7 +246,7 @@
 <string name="poi_pension_fund">صندوق بازنشستگی</string>
 <string name="poi_migration">سازمان مهاجرت</string>
 <string name="poi_tax_inspection">اداره مالیات</string>
-<string name="poi_administrative_office">دفتر اجرایی</string>
+<string name="poi_office_administrative">دفتر اجرایی</string>
 <string name="poi_customs">گمرک</string>
 <string name="poi_city">شهرستان</string>
 <string name="poi_town">شهر</string>
@@ -287,14 +287,14 @@
 <string name="poi_insurance">بیمه</string>
 <string name="poi_estate_agent">مشاور املاک</string>
 <string name="poi_lawyer">دفتر وکالت</string>
-<string name="poi_telecommunication_office">دفتر مخابراتی</string>
+<string name="poi_office_telecommunication">دفتر مخابراتی</string>
 <string name="poi_ngo">NGO</string>
 <string name="poi_town_hall">شهرداری</string>
 <string name="poi_employment_agency">کاریابی</string>
-<string name="poi_research_office">مرکز تحقیقاتی</string>
-<string name="poi_it_office">دفتر فناوری اطلاعات</string>
-<string name="poi_newspaper_office">دفتر روزنامه</string>
-<string name="poi_architect_office">مرکز معماری</string>
+<string name="poi_research">مرکز تحقیقاتی</string>
+<string name="poi_it">دفتر فناوری اطلاعات</string>
+<string name="poi_newspaper">دفتر روزنامه</string>
+<string name="poi_architect">مرکز معماری</string>
 <string name="poi_advertising_agency">آژانس تبلیغاتی</string>
 <string name="poi_educational_institution">موسسه آموزشی</string>
 <string name="poi_studio">استودیو</string>
@@ -376,11 +376,11 @@
 <string name="poi_city_gate">دروازه شهرستان</string>
 <string name="poi_fort">برج و بارو</string>
 <string name="poi_fountain">چشمه</string>
-<string name="poi_ruins_historic">خرابه های تاریخی</string>
+<string name="poi_historic_ruins">خرابه های تاریخی</string>
 <string name="poi_rune_stone">سنگ نوشته ها</string>
 <string name="poi_wreck">کشتی شکسته</string>
-<string name="poi_ship_historic">کشتی تاریخی</string>
-<string name="poi_mine_historic">معدن تاریخی</string>
+<string name="poi_historic_ship">کشتی تاریخی</string>
+<string name="poi_historic_mine">معدن تاریخی</string>
 <string name="poi_monument">اثر تاریخی</string>
 <string name="poi_zoo">باغ وحش</string>
 <string name="poi_theme_park">شهربازی</string>
@@ -388,7 +388,7 @@
 <string name="poi_attraction">جاذبه های گردشگری</string>
 <string name="poi_amusement_ride">سواری تفریحی</string>
 <string name="poi_attraction_animal">حیوانات (جاذبه)</string>
-<string name="poi_ferris_wheel">چرخ فلک بزرگ</string>
+<string name="poi_big_wheel">چرخ فلک بزرگ</string>
 <string name="poi_carousel">تاب</string>
 <string name="poi_maze">ترن سریع</string>
 <string name="poi_roller_coaster">ترن هوایی</string>
@@ -406,19 +406,19 @@
 <string name="poi_chalet">کلبه ییلاقی</string>
 
 <string name="poi_place_of_worship">پرستشگاه</string>
-<string name="poi_place_of_worship_christian">پرستشگاه: مسیحیان</string>
-<string name="poi_place_of_worship_jewish">پرستشگاه: یهودیان</string>
-<string name="poi_place_of_worship_muslim">Place of worship: muslim</string>
-<string name="poi_place_of_worship_sikh">پرستشگاه: سیک ها</string>
-<string name="poi_place_of_worship_buddhist">پرستشگاه: بودایی</string>
-<string name="poi_place_of_worship_hindu">پرستشگاه: هندوها</string>
-<string name="poi_place_of_worship_shinto">پرستشگاه: مذهب شینتو</string>
-<string name="poi_place_of_worship_taoist">پرستشگاه: تائوئیست</string>
+<string name="poi_religion_christian">پرستشگاه: مسیحیان</string>
+<string name="poi_religion_jewish">پرستشگاه: یهودیان</string>
+<string name="poi_religion_muslim">Place of worship: muslim</string>
+<string name="poi_religion_sikh">پرستشگاه: سیک ها</string>
+<string name="poi_religion_buddhist">پرستشگاه: بودایی</string>
+<string name="poi_religion_hindu">پرستشگاه: هندوها</string>
+<string name="poi_religion_shinto">پرستشگاه: مذهب شینتو</string>
+<string name="poi_religion_taoist">پرستشگاه: تائوئیست</string>
 <string name="poi_monastery">صومعه</string>
 <string name="poi_historic_monastery">صومعه تاریخی</string>
 <string name="poi_wayside_cross">ایستگاه بین راهی</string>
 <string name="poi_wayside_shrine">زیارتگاه بین راهی</string>
-<string name="poi_tourism_information">اطلاعات گردشگری</string>
+<string name="poi_information">اطلاعات گردشگری</string>
 <string name="poi_clock">ساعت</string>
 <string name="poi_travel_agent">آژانس مسافرتی</string>
 <string name="poi_viewpoint">نقشه</string>
@@ -472,7 +472,7 @@
 <string name="poi_stripclub">کلوپ</string>
 <string name="poi_beach_resort">تفریحگاه ساحل</string>
 <string name="poi_dog_park">پارک سگ</string>
-<string name="poi_fishing_place">محل ماهیگیری</string>
+<string name="poi_leisure_fishing">محل ماهیگیری</string>
 <string name="poi_hunting_stand">غرفه شکار</string>
 <string name="poi_harbour">بندرگاه</string>
 <string name="poi_marina">لنگرگاه تفریحی</string>
@@ -492,58 +492,58 @@
 <string name="poi_drinking_water">آب آشامیدنی</string>
 <string name="poi_barbecue">کبابی</string>
 
-<string name="poi_agricultural_engines_craft">ادوات کشاورزی</string>
-<string name="poi_basket_maker">سبد خرید</string>
-<string name="poi_beekeeper">زنبورداری</string>
-<string name="poi_blacksmith">آهنگر</string>
-<string name="poi_brewery">ابجوسازی</string>
-<string name="poi_boatbuilder">قایق ساز</string>
-<string name="poi_bookbinder">صحافی</string>
-<string name="poi_carpenter">نجاری</string>
-<string name="poi_carpet_layer">فروشگاه کفپوش</string>
-<string name="poi_caterer">میزبان جشنها</string>
-<string name="poi_clockmaker">ساعت سازی</string>
-<string name="poi_dressmaker">خیاط زنانه</string>
-<string name="poi_electrician">متخصص برق</string>
-<string name="poi_gardener">باغبان</string>
-<string name="poi_glaziery_craft">شیشه بر</string>
-<string name="poi_handicraft">صنایع دستی</string>
-<string name="poi_hvac">تهویه</string>
-<string name="poi_insulation_craft">عایق</string>
-<string name="poi_jeweller">جواهر سازی</string>
-<string name="poi_locksmith">کلید سازی</string>
-<string name="poi_key_cutter">برش</string>
-<string name="poi_metal_construction_craft">سازه های فلزی</string>
-<string name="poi_optician">عینک ساز</string>
-<string name="poi_painter">نقاش</string>
-<string name="poi_parquet_layer">پارکت</string>
-<string name="poi_photographer">آتلیه عکاسی</string>
-<string name="poi_photographic_laboratory">لابراتوار چاپ عکس</string>
-<string name="poi_plasterer">گچ بری</string>
-<string name="poi_plumber">لوله کش</string>
-<string name="poi_pottery_craft">سفال سازس</string>
-<string name="poi_rigger">حفاری چاه</string>
-<string name="poi_roofer">ایزوگام</string>
-<string name="poi_saddler">سراج</string>
-<string name="poi_sailmaker">لوازم قایق</string>
-<string name="poi_sawmill">پوب بری</string>
-<string name="poi_scaffolder">Scaffolder</string>
-<string name="poi_sculptor">مجسمه ساز</string>
-<string name="poi_shoemaker">کفاش</string>
-<string name="poi_stand_builder">ساخت و ساز</string>
-<string name="poi_stonemason">سنگ تراش</string>
-<string name="poi_sun_protection_craft">صنایع حفاظتی</string>
-<string name="poi_sweep">رفته گر</string>
-<string name="poi_tailor">خیاط</string>
-<string name="poi_tiler">اجر پزی</string>
-<string name="poi_tinsmith">تراشکار</string>
-<string name="poi_upholsterer">پرده دوزی</string>
-<string name="poi_watchmaker">ساعت ساز</string>
-<string name="poi_window_construction">ساخت و ساز پنجره</string>
+<string name="poi_craft_agricultural_engines">ادوات کشاورزی</string>
+<string name="poi_craft_basket_maker">سبد خرید</string>
+<string name="poi_craft_beekeeper">زنبورداری</string>
+<string name="poi_craft_blacksmith">آهنگر</string>
+<string name="poi_craft_brewery">ابجوسازی</string>
+<string name="poi_craft_boatbuilder">قایق ساز</string>
+<string name="poi_craft_bookbinder">صحافی</string>
+<string name="poi_craft_carpenter">نجاری</string>
+<string name="poi_craft_carpet_layer">فروشگاه کفپوش</string>
+<string name="poi_craft_caterer">میزبان جشنها</string>
+<string name="poi_craft_clockmaker">ساعت سازی</string>
+<string name="poi_craft_dressmaker">خیاط زنانه</string>
+<string name="poi_craft_electrician">متخصص برق</string>
+<string name="poi_craft_gardener">باغبان</string>
+<string name="poi_craft_glaziery">شیشه بر</string>
+<string name="poi_craft_handicraft">صنایع دستی</string>
+<string name="poi_craft_hvac">تهویه</string>
+<string name="poi_craft_insulation">عایق</string>
+<string name="poi_craft_jeweller">جواهر سازی</string>
+<string name="poi_craft_locksmith">کلید سازی</string>
+<string name="poi_craft_key_cutter">برش</string>
+<string name="poi_craft_metal_construction">سازه های فلزی</string>
+<string name="poi_craft_optician">عینک ساز</string>
+<string name="poi_craft_painter">نقاش</string>
+<string name="poi_craft_parquet_layer">پارکت</string>
+<string name="poi_craft_photographer">آتلیه عکاسی</string>
+<string name="poi_craft_photographic_laboratory">لابراتوار چاپ عکس</string>
+<string name="poi_craft_plasterer">گچ بری</string>
+<string name="poi_craft_plumber">لوله کش</string>
+<string name="poi_craft_pottery">سفال سازس</string>
+<string name="poi_craft_rigger">حفاری چاه</string>
+<string name="poi_craft_roofer">ایزوگام</string>
+<string name="poi_craft_saddler">سراج</string>
+<string name="poi_craft_sailmaker">لوازم قایق</string>
+<string name="poi_craft_sawmill">پوب بری</string>
+<string name="poi_craft_scaffolder">Scaffolder</string>
+<string name="poi_craft_sculptor">مجسمه ساز</string>
+<string name="poi_craft_shoemaker">کفاش</string>
+<string name="poi_craft_stand_builder">ساخت و ساز</string>
+<string name="poi_craft_stonemason">سنگ تراش</string>
+<string name="poi_craft_sun_protection">صنایع حفاظتی</string>
+<string name="poi_craft_sweep">رفته گر</string>
+<string name="poi_craft_tailor">خیاط</string>
+<string name="poi_craft_tiler">اجر پزی</string>
+<string name="poi_craft_tinsmith">تراشکار</string>
+<string name="poi_craft_upholsterer">پرده دوزی</string>
+<string name="poi_craft_watchmaker">ساعت ساز</string>
+<string name="poi_craft_window_construction">ساخت و ساز پنجره</string>
 
 <string name="poi_funeral_directors">قبرکن</string>
-<string name="poi_computer_craft">صنایع کامپیوتر</string>
-<string name="poi_beauty_salon">سالن زیبایی</string>
+<string name="poi_craft_computer">صنایع کامپیوتر</string>
+<string name="poi_beauty">سالن زیبایی</string>
 <string name="poi_beauty_salon_nails">کاشت ناخن</string>
 <string name="poi_hairdresser">آرایشگر</string>
 <string name="poi_massage">سالن ماساژ</string>
@@ -567,7 +567,7 @@
 <string name="poi_pawnbroker">بنگاه رهنی</string>
 <string name="poi_currencyexchange">صرافی</string>
 <string name="poi_accountant">حسابداری</string>
-<string name="poi_bitcoin_yes">پرداخت عوارض</string>
+<string name="poi_bitcoin">پرداخت عوارض</string>
 
 <string name="poi_cave_entrance">ورودی غار</string>
 <string name="poi_peak">قله کوه</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 6be03ac8fd..3dda105153 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -12,13 +12,13 @@
 	<string name="poi_aerialway_station">Station de transport aérien par câble</string>
 	<string name="poi_aeroway_gate">Porte d\'embarquement</string>
 	<string name="poi_runway">Aérodrome : piste</string>
-	<string name="poi_airport">Aérodrome</string>
+	<string name="poi_airport">Aérodrome</string> 
 	<string name="poi_alcohol">Magasin de boissons alcoolisées</string>
 	<string name="poi_alpine_hut">Refuge</string>
 	<string name="poi_ambulance_station">Station d\'ambulances</string>
 	<string name="poi_archaeological_site">Site archéologique</string>
 	<string name="poi_archery">Tir à l\'arc</string>
-	<string name="poi_architect_office">Architecte</string>
+	<string name="poi_architect">Architecte</string>
 	<string name="poi_arts_centre">Centre artistique</string>
 	<string name="poi_artwork">Œuvre d’art</string>
 	<string name="poi_athletics">Athlétisme</string>
@@ -41,24 +41,24 @@
 	<string name="poi_seamark_beacon_lateral">Balise latérale</string>
 	<string name="poi_seamark_beacon_safe_water">Marque d\'eaux saines</string>
 	<string name="poi_seamark_beacon_special_purpose">Marque spéciale</string>
-	<string name="poi_beauty_salon">Salon de beauté</string>
+	<string name="poi_beauty">Salon de beauté</string>
 	<string name="poi_beverages">Magasin de boissons</string>
-	<string name="poi_bicycle_shop">Magasin de vélos</string>
+	<string name="poi_bicycle">Magasin de vélos</string>
 	<string name="poi_bicycle_parking">Parking à vélos</string>
 	<string name="poi_bicycle_rental">Location de vélos</string>
 	<string name="poi_biergarten">Brasserie en plein air</string>
-	<string name="poi_bitcoin_yes">Paiement par bitcoins</string>
+	<string name="poi_bitcoin">Paiement par bitcoins</string>
 	<string name="poi_boat_sharing">Partage de voiliers</string>
 	<string name="poi_boatyard">Cale sèche</string>
-	<string name="poi_bookshop">Librairie</string>
+	<string name="poi_books">Librairie</string>
 	<string name="poi_boules">Jeu de boules</string>
 	<string name="poi_boundary_stone">Borne frontière</string>
 	<string name="poi_boutique">Boutique de mode</string>
 	<string name="poi_bowls">Boulingrin</string>
-	<string name="poi_brewery">Brasserie</string>
+	<string name="poi_craft_brewery">Brasserie</string>
 	<string name="poi_bridge">Pont</string>
 	<string name="poi_brothel">Maison de prostitution</string>
-	<string name="poi_place_of_worship_buddhist">Bouddhisme</string>
+	<string name="poi_religion_buddhist">Bouddhisme</string>
 	<string name="poi_military_bunker">Casemate</string>
 	<string name="poi_seamark_buoy_cardinal">Bouée cardinale (balise flottante)</string>
 	<string name="poi_seamark_buoy_installation">Bouée de chargement / déchargement</string>
@@ -80,19 +80,19 @@
 	<string name="poi_car_sharing">Autopartage</string>
 	<string name="poi_car_wash">Lavage de voitures</string>
 	<string name="poi_caravan_site">Aire de camping-car</string>
-	<string name="poi_carpenter">Charpentier</string>
+	<string name="poi_craft_carpenter">Charpentier</string>
 	<string name="poi_casino">Casino</string>
 	<string name="poi_castle">Château</string>
 	<string name="poi_cave_entrance">Entrée de grotte</string>
 	<string name="poi_cemetery">Cimetière</string>
 	<string name="poi_chalet">Meublé de tourisme</string>
 	<string name="poi_charging_station">Station de recharge</string>
-	<string name="poi_chemist_shop">Magasin de produits d\'hygiène</string>
+	<string name="poi_chemist">Magasin de produits d\'hygiène</string>
 	<string name="poi_city">Ville</string>
 	<string name="poi_city_wall">Remparts</string>
 	<string name="poi_climbing">Escalade</string>
 	<string name="poi_clinic">Clinique</string>
-	<string name="poi_clothes_shop">Magasin de vêtements</string>
+	<string name="poi_clothes">Magasin de vêtements</string>
 	<string name="poi_club_art">Boutique d\'art</string>
 	<string name="poi_club_charity">Magasin de bienfaisance</string>
 	<string name="poi_club_chess">Échecs</string>
@@ -109,7 +109,7 @@
 	<string name="poi_construction">Voie ferrée en construction</string>
 	<string name="poi_convenience">Épicerie</string>
 	<string name="poi_copyshop">Magasin de photocopies</string>
-	<string name="poi_cosmetics_shop">Magasin de cosmétiques</string>
+	<string name="poi_cosmetics">Magasin de cosmétiques</string>
 	<string name="poi_courthouse">Palais de justice</string>
 	<string name="poi_crater">Cratère</string>
 	<string name="poi_crematorium">Crématorium</string>
@@ -132,15 +132,15 @@
 	<string name="poi_driving_school">École de conduite</string>
 	<string name="poi_dry_cleaning">Pressing</string>
 	<string name="poi_seamark_dyke">Digue</string>
-	<string name="poi_electrician">Électricien</string>
-	<string name="poi_electronics_shop">Magasin d\'électronique</string>
+	<string name="poi_craft_electrician">Électricien</string>
+	<string name="poi_electronics">Magasin d\'électronique</string>
 	<string name="poi_embassy">Ambassade</string>
 	<string name="poi_emergency_access_point">Point d\'accès d\'urgence</string>
 	<string name="poi_emergency_phone">Téléphone de secours</string>
 	<string name="poi_employment_agency">Agence pour l\'emploi</string>
 	<string name="poi_equestrian">Sport équestre</string>
 	<string name="poi_estate_agent">Agence immobilière</string>
-	<string name="poi_fabric_shop">Magasin de tissus</string>
+	<string name="poi_fabric">Magasin de tissus</string>
 	<string name="poi_fast_food">Restauration rapide</string>
 	<string name="poi_ferry_terminal">Terminal de ferry</string>
 	<string name="poi_fire_extinguisher">Extincteur</string>
@@ -148,7 +148,7 @@
 	<string name="poi_fire_hydrant">Bouche d\'incendie</string>
 	<string name="poi_fire_station">Caserne de pompiers</string>
 	<string name="poi_first_aid">Premiers secours</string>
-	<string name="poi_fishing_shop">Zone de pêche</string>
+	<string name="poi_fishing">Zone de pêche</string>
 	<string name="poi_florist">Fleuriste</string>
 	<string name="poi_seamark_fog_signal">Signal de brume</string>
 	<string name="poi_food_court">Aire de restauration</string>
@@ -157,12 +157,12 @@
 	<string name="poi_fuel">Carburant</string>
 	<string name="poi_funeral_directors">Pompes funèbres</string>
 	<string name="poi_funicular">Voie de funiculaire</string>
-	<string name="poi_furniture_shop">Magasin d\'ameublement</string>
+	<string name="poi_furniture">Magasin d\'ameublement</string>
 	<string name="poi_garden_centre">Jardinerie</string>
-	<string name="poi_general_shop">Magasin généraliste</string>
-	<string name="poi_gift_shop">Boutique de cadeaux</string>
+	<string name="poi_general">Magasin généraliste</string>
+	<string name="poi_gift">Boutique de cadeaux</string>
 	<string name="poi_glacier">Glacier</string>
-	<string name="poi_glaziery_shop">Vitrier</string>
+	<string name="poi_glaziery">Vitrier</string>
 	<string name="poi_golf">Golf</string>
 	<string name="poi_golf_course">Terrain de golf</string>
 	<string name="poi_grave_yard">Cimetière</string>
@@ -174,11 +174,11 @@
 	<string name="poi_hamlet">Hameau</string>
 	<string name="poi_seamark_harbour">Port</string>
 	<string name="poi_seamark_harbour_basin">Bassin portuaire</string>
-	<string name="poi_hardware_shop">Quincaillerie</string>
+	<string name="poi_hardware">Quincaillerie</string>
 	<string name="poi_hearing_aids">Audioprothésiste</string>
 	<string name="poi_helipad">Hélisurface</string>
-	<string name="poi_hifi_shop">Magasin Hi-Fi</string>
-	<string name="poi_place_of_worship_hindu">Hindouisme</string>
+	<string name="poi_hifi">Magasin Hi-Fi</string>
+	<string name="poi_religion_hindu">Hindouisme</string>
 	<string name="poi_hockey">Hockey</string>
 	<string name="poi_horse_track">Courses hippiques</string>
 	<string name="poi_hospital">Hôpital</string>
@@ -188,14 +188,14 @@
 	<string name="poi_ice_cream">Crème glacée</string>
 	<string name="poi_ice_rink">Patinoire</string>
 	<string name="poi_ice_stock">Eisstock</string>
-	<string name="poi_tourism_information">Informations touristiques</string>
+	<string name="poi_information">Informations touristiques</string>
 	<string name="poi_insurance">Assurance</string>
 	<string name="poi_island">Île</string>
 	<string name="poi_islet">Îlot</string>
 	<string name="poi_isolated_dwelling">Habitation isolée</string>
-	<string name="poi_it_office">Technologies de l\'information et de la communication</string>
-	<string name="poi_jewelry_shop">Bijouterie</string>
-	<string name="poi_key_cutter">Reproduction de clefs</string>
+	<string name="poi_it">Technologies de l\'information et de la communication</string>
+	<string name="poi_jewelry">Bijouterie</string>
+	<string name="poi_craft_key_cutter">Reproduction de clefs</string>
 	<string name="poi_kindergarten">Petite enfance</string>
 	<string name="poi_kiosk">Kiosque</string>
 	<string name="poi_korfbal">Korfball</string>
@@ -212,17 +212,17 @@
 	<string name="poi_seamark_light_vessel">Bateau-feu</string>
 	<string name="poi_lighthouse">Phare</string>
 	<string name="poi_locality">Lieu-dit</string>
-	<string name="poi_locksmith">Serrurier</string>
+	<string name="poi_craft_locksmith">Serrurier</string>
 	<string name="poi_mall">Galerie marchande</string>
 	<string name="poi_marina">Port de plaisance</string>
 	<string name="poi_marketplace">Marché</string>
 	<string name="poi_massage">Massage</string>
 	<string name="poi_memorial">Mémorial</string>
 	<string name="poi_military">Militaire</string>
-	<string name="poi_mine_historic">Mine abandonnée</string>
+	<string name="poi_historic_mine">Mine abandonnée</string>
 	<string name="poi_mineshaft">Puits de mine</string>
 	<string name="poi_miniature_golf">Golf miniature</string>
-	<string name="poi_mobile_phone_shop">Magasin de téléphones mobiles</string>
+	<string name="poi_mobile_phone">Magasin de téléphones mobiles</string>
 	<string name="poi_monastery">Monastère</string>
 	<string name="poi_money_lender">Usurier</string>
 	<string name="poi_monument">Monument commémoratif</string>
@@ -231,37 +231,37 @@
 	<string name="poi_motorway_junction">Jonction d\'autoroutes</string>
 	<string name="poi_multi_sport">Multisports</string>
 	<string name="poi_museum">Musée</string>
-	<string name="poi_musical_instrument_shop">Magasin d\'instruments de musique</string>
+	<string name="poi_musical_instrument">Magasin d\'instruments de musique</string>
 	<string name="poi_nature_reserve">Réserve naturelle</string>
 	<string name="poi_military_naval_base">Base navale militaire</string>
 	<string name="poi_neighbourhood">Quartier</string>
-	<string name="poi_newsagent_shop">Marchand de journaux</string>
-	<string name="poi_newspaper_office">Presse</string>
+	<string name="poi_newsagent">Marchand de journaux</string>
+	<string name="poi_newspaper">Presse</string>
 	<string name="poi_ngo">ONG</string>
 	<string name="poi_nightclub">Boîte de nuit</string>
 	<string name="poi_optician_shop">Opticien</string>
-	<string name="poi_organic_shop">Magasin bio</string>
+	<string name="poi_organic">Magasin bio</string>
 	<string name="poi_orienteering">Course d\'orientation</string>
-	<string name="poi_outdoor_shop">Magasin d\'activités de plein air</string>
+	<string name="poi_outdoor">Magasin d\'activités de plein air</string>
 	<string name="poi_paddle_tennis">Padel</string>
 	<string name="poi_parking">Parc de stationnement</string>
 	<string name="poi_parking_entrance">Entrée de parking</string>
 	<string name="poi_pawnbroker">Mont-de-piété</string>
 	<string name="poi_peak">Sommet</string>
 	<string name="poi_pelota">Pelote basque</string>
-	<string name="poi_pet_shop">Magasin d\'animaux</string>
+	<string name="poi_pet">Magasin d\'animaux</string>
 	<string name="poi_petroleum_well">Puits de pétrole</string>
 	<string name="poi_pharmacy">Pharmacie</string>
 	<string name="poi_photo">Magasin de photographie</string>
-	<string name="poi_photographer">Photographe</string>
+	<string name="poi_craft_photographer">Photographe</string>
 	<string name="poi_picnic_site">Site de pique-nique</string>
 	<string name="poi_pitch">Terrain de sport</string>
 	<string name="poi_place_of_worship">Lieu de culte</string>
-	<string name="poi_place_of_worship_christian">Christianisme</string>
-	<string name="poi_place_of_worship_jewish">Judaïsme</string>
-	<string name="poi_place_of_worship_muslim">Islam</string>
+	<string name="poi_religion_christian">Christianisme</string>
+	<string name="poi_religion_jewish">Judaïsme</string>
+	<string name="poi_religion_muslim">Islam</string>
 	<string name="poi_playground">Jeux pour enfants</string>
-	<string name="poi_plumber">Plombier</string>
+	<string name="poi_craft_plumber">Plombier</string>
 	<string name="poi_police">Police</string>
 	<string name="poi_post_box">Boîtes aux lettres</string>
 	<string name="poi_post_office">Bureau de poste</string>
@@ -281,13 +281,13 @@
 	<string name="poi_rapids">Rapides</string>
 	<string name="poi_recycling">Collecte sélective des déchets</string>
 	<string name="poi_reef">Récif</string>
-	<string name="poi_research_office">Centre de recherche</string>
+	<string name="poi_research">Centre de recherche</string>
 	<string name="poi_resort">Station touristique</string>
 	<string name="poi_restaurant">Restaurant</string>
 	<string name="poi_ridge">Crête</string>
 	<string name="poi_river">Rivière</string>
 	<string name="poi_rugby">Rugby</string>
-	<string name="poi_ruins_historic">Ruines historiques</string>
+	<string name="poi_historic_ruins">Ruines historiques</string>
 	<string name="poi_salt_pond">Marais salants</string>
 	<string name="poi_sanatorium">Sanatorium</string>
 	<string name="poi_sauna">Sauna</string>
@@ -297,10 +297,10 @@
 	<string name="poi_second_hand">Magasin de produits d\'occasion</string>
 	<string name="poi_ses_station">Association Australienne d\'aide d\'urgence (SES)</string>
 	<string name="poi_shelter">Abri</string>
-	<string name="poi_place_of_worship_shinto">Shintoïsme</string>
-	<string name="poi_shoemaker">Cordonnier</string>
+	<string name="poi_religion_shinto">Shintoïsme</string>
+	<string name="poi_craft_shoemaker">Cordonnier</string>
 	<string name="poi_shoes">Magasin de chaussures</string>
-	<string name="poi_place_of_worship_sikh">Sikhisme</string>
+	<string name="poi_religion_sikh">Sikhisme</string>
 	<string name="poi_sinkhole">Doline</string>
 	<string name="poi_skateboard">Planche à roulettes</string>
 	<string name="poi_skating">Patin à glace</string>
@@ -310,39 +310,38 @@
 	<string name="poi_social_centre">Communauté</string>
 	<string name="poi_social_facility">Service social</string>
 	<string name="poi_speed_camera">Radar automatique</string>
-	<string name="poi_sports_shop">Magasin de sport</string>
+	<string name="poi_sports">Magasin de sport</string>
 	<string name="poi_sports_centre">Centre sportif</string>
 	<string name="poi_spring">Source</string>
 	<string name="poi_stadium">Stade</string>
-	<string name="poi_stationery">Papeterie</string>
 	<string name="poi_stone">Rocher isolé</string>
 	<string name="poi_strait">Détroit</string>
 	<string name="poi_stream">Ruisseau</string>
 	<string name="poi_stripclub">Club de strip-tease</string>
 	<string name="poi_studio">Studio d\'enregistrement</string>
 	<string name="poi_suburb">Quartier</string>
-	<string name="poi_subway_entrance">Bouche de métro</string>
+	<string name="poi_railway_subway_entrance">Bouche de métro</string>
 	<string name="poi_supermarket">Supermarché</string>
 	<string name="poi_survey_point">Point géodésique</string>
 	<string name="poi_swimming">Natation</string>
 	<string name="poi_swimming_pool">Piscine</string>
 	<string name="poi_table_tennis">Tennis de table</string>
-	<string name="poi_tailor">Couturier</string>
-	<string name="poi_place_of_worship_taoist">Taoïsme</string>
+	<string name="poi_craft_tailor">Couturier</string>
+	<string name="poi_religion_taoist">Taoïsme</string>
 	<string name="poi_tattoo">Salon de tatouage</string>
 	<string name="poi_taxi">Taxi</string>
 	<string name="poi_team_handball">Handball</string>
-	<string name="poi_telecommunication_office">Entreprise de télécommunications</string>
+	<string name="poi_office_telecommunication">Entreprise de télécommunications</string>
 	<string name="poi_telephone">Téléphone public</string>
 	<string name="poi_tennis">Tennis</string>
 	<string name="poi_aeroway_terminal">Terminal aéroportuaire</string>
 	<string name="poi_theme_park">Parc à thème</string>
-	<string name="poi_tobacco_shop">Tabac</string>
+	<string name="poi_tobacco">Tabac</string>
 	<string name="poi_toboggan">Toboggan</string>
 	<string name="poi_toilets">Toilettes</string>
 	<string name="poi_seamark_topmark">Voyant maritime</string>
 	<string name="poi_town">Ville</string>
-	<string name="poi_toys_shop">Magasin de jouets</string>
+	<string name="poi_toys">Magasin de jouets</string>
 	<string name="poi_leisure_track">Piste de sport</string>
 	<string name="poi_traffic_calming_bump">Ralentisseur (dos d\'âne)</string>
 	<string name="poi_traffic_calming_chicane">Ralentisseur (chicane)</string>
@@ -357,7 +356,7 @@
 	<string name="poi_variety_store">Bazar</string>
 	<string name="poi_vending_machine">Distributeur automatique</string>
 	<string name="poi_veterinary">Vétérinaire</string>
-	<string name="poi_video_shop">Magasin de vidéos</string>
+	<string name="poi_video">Magasin de vidéos</string>
 	<string name="poi_viewpoint">Point de vue</string>
 	<string name="poi_village">Village</string>
 	<string name="poi_vineyard">Vignoble</string>
@@ -366,7 +365,7 @@
 	<string name="poi_waste_basket">Corbeille publique</string>
 	<string name="poi_waste_disposal">Bac à ordures ménagères</string>
 	<string name="poi_wastewater_plant">Station d\'épuration</string>
-	<string name="poi_watchmaker">Horloger</string>
+	<string name="poi_craft_watchmaker">Horloger</string>
 	<string name="poi_lock_gate">Porte d\'écluse</string>
 	<string name="poi_water_park">Parc aquatique</string>
 	<string name="poi_water_tower">Château d\'eau</string>
@@ -384,10 +383,10 @@
 	<string name="poi_wreck">Épave</string>
 	<string name="poi_zoo">Zoo</string>
 <string name="poi_shop_tea">Salon de thé</string>
-	<string name="poi_art_shop">Boutique d\'Art</string>
-	<string name="poi_carpet_shop">Magasin de tapis</string>
-	<string name="poi_computer_shop">Boutique informatique</string>
-	<string name="poi_dive_shop">Équipement de plongée sous-marine</string>
+	<string name="poi_art">Boutique d\'Art</string>
+	<string name="poi_carpet">Magasin de tapis</string>
+	<string name="poi_computer">Boutique informatique</string>
+	<string name="poi_dive">Équipement de plongée sous-marine</string>
 	<string name="poi_ship_chandler">Magasin d\'accastillage</string>
 	<string name="poi_gate">Pont</string>
 	<string name="poi_traffic_signals">Feux tricolores</string>
@@ -405,10 +404,10 @@
 	<string name="poi_palaeontological_site">Site paléontologique</string>
 
 	<string name="poi_shop_farm">Vente à la ferme</string>
-	<string name="poi_anime_shop">Librairie spécialisée en bandes dessinées</string>
-	<string name="poi_antiques_shop">Antiquaire</string>
-	<string name="poi_hunting_shop">Equipement de chasse</string>
-	<string name="poi_interior_decoration_shop">Boutique de décoration</string>
+	<string name="poi_anime">Librairie spécialisée en bandes dessinées</string>
+	<string name="poi_antiques">Antiquaire</string>
+	<string name="poi_hunting">Equipement de chasse</string>
+	<string name="poi_interior_decoration">Boutique de décoration</string>
 	<string name="poi_lift_gate">Pont levant</string>
 	<string name="poi_border_control">Poste frontière</string>
 	<string name="poi_traffic_calming_table">Table</string>
@@ -433,7 +432,7 @@
 	<string name="poi_motor_sport">Sport mécanique</string>
 	<string name="poi_paragliding">Parapente</string>
 	<string name="poi_rowing">Aviron</string>
-	<string name="poi_ship_historic">Bateau du patrimoine</string>
+	<string name="poi_historic_ship">Bateau du patrimoine</string>
 	<string name="poi_clock">Horloge</string>
 	<string name="poi_club_astronomy">Club d\'astronomie</string>
 	<string name="poi_club_sport">Club de sports</string>
@@ -443,18 +442,18 @@
 	<string name="poi_cinema">Cinéma</string>
 	<string name="poi_theatre">Théâtre</string>
 	<string name="poi_circus">Cirque</string>
-	<string name="poi_fishing_place">Lieu de pêche</string>
+	<string name="poi_leisure_fishing">Lieu de pêche</string>
 	<string name="poi_park">Parc</string>
 
 	<string name="poi_barbecue">Barbecue</string>
 
-	<string name="poi_boatbuilder">Chantier naval</string>
-	<string name="poi_clockmaker">Horloger</string>
-	<string name="poi_jeweller">Bijoutier</string>
-	<string name="poi_optician">Opticien</string>
-	<string name="poi_photographic_laboratory">Laboratoire photographique</string>
-	<string name="poi_sailmaker">Maître voilier</string>
-	<string name="poi_sculptor">Sculpteur</string>
+	<string name="poi_craft_boatbuilder">Chantier naval</string>
+	<string name="poi_craft_clockmaker">Horloger</string>
+	<string name="poi_craft_jeweller">Bijoutier</string>
+	<string name="poi_craft_optician">Opticien</string>
+	<string name="poi_craft_photographic_laboratory">Laboratoire photographique</string>
+	<string name="poi_craft_sailmaker">Maître voilier</string>
+	<string name="poi_craft_sculptor">Sculpteur</string>
 	<string name="poi_beauty_salon_nails">Salon de manucure</string>
 	<string name="poi_internet_cafe">Café Internet</string>
 
@@ -469,17 +468,16 @@
 	<string name="poi_seamark_mooring">Mouillage</string>
 	<string name="poi_seamark_wreck">Épave</string>
 
-	<string name="poi_bag_shop">Maroquinerie</string>
+	<string name="poi_bag">Maroquinerie</string>
 	<string name="poi_military_airfield">Aérodrome militaire</string>
-	<string name="poi_bedding_shop">Magasin de literie</string>
-	<string name="poi_erotic_shop">Boutique coquine</string>
-	<string name="poi_hearing_aids_shop">Magasin d\'appareils auditifs</string>
+	<string name="poi_bedding">Magasin de literie</string>
+	<string name="poi_erotic">Boutique coquine</string>
 	<string name="poi_herbalist">Herboriste</string>
-	<string name="poi_kitchen_shop">Boutique d\'ustensiles de cuisine</string>
-	<string name="poi_stationery_shop">Papeterie</string>
-	<string name="poi_tableware_shop">Boutique de vaisselle</string>
-	<string name="poi_ticket_shop">Guichet</string>
-	<string name="poi_vacuum_cleaner_shop">Boutique de gadgets</string>
+	<string name="poi_kitchen">Boutique d\'ustensiles de cuisine</string>
+	<string name="poi_stationery">Papeterie</string>
+	<string name="poi_tableware">Boutique de vaisselle</string>
+	<string name="poi_ticket">Guichet</string>
+	<string name="poi_vacuum_cleaner">Boutique de gadgets</string>
 	<string name="poi_mountain_pass">Col</string>
 	<string name="poi_garages">Garages</string>
 
@@ -492,29 +490,29 @@
 	<string name="poi_astronomical_observatory">Observatoire astronomique</string>
 	<string name="poi_orchard">Verger</string>
 	<string name="poi_prosecutor">Procureur</string>
-	<string name="poi_administrative_office">Centre administratif</string>
+	<string name="poi_office_administrative">Centre administratif</string>
 	<string name="poi_seamark_rock">Rocher (amer)</string>
 	<string name="poi_seamark_distance_mark">Borne</string>
-	<string name="poi_upholsterer">Tapissier</string>
-	<string name="poi_tiler">Carreleur</string>
-	<string name="poi_stonemason">Tailleur de pierre</string>
-	<string name="poi_scaffolder">Échafaudage</string>
-	<string name="poi_sawmill">Scierie</string>
-	<string name="poi_saddler">Sellier</string>
-	<string name="poi_roofer">Couvreur</string>
-	<string name="poi_rigger">Gréeur</string>
-	<string name="poi_pottery_craft">Poterie artisanale</string>
-	<string name="poi_plasterer">Plâtrier</string>
-	<string name="poi_painter">Peintre en bâtiment</string>
-	<string name="poi_handicraft">Artisanat</string>
-	<string name="poi_glaziery_craft">Vitrerie artisanale</string>
-	<string name="poi_gardener">Jardinier</string>
-	<string name="poi_dressmaker">Couturière</string>
-	<string name="poi_caterer">Traiteur</string>
-	<string name="poi_bookbinder">Relieur</string>
-	<string name="poi_beekeeper">Apiculteur</string>
-	<string name="poi_basket_maker">Vannier</string>
-	<string name="poi_agricultural_engines_craft">Engins agricoles</string>
+	<string name="poi_craft_upholsterer">Tapissier</string>
+	<string name="poi_craft_tiler">Carreleur</string>
+	<string name="poi_craft_stonemason">Tailleur de pierre</string>
+	<string name="poi_craft_scaffolder">Échafaudage</string>
+	<string name="poi_craft_sawmill">Scierie</string>
+	<string name="poi_craft_saddler">Sellier</string>
+	<string name="poi_craft_roofer">Couvreur</string>
+	<string name="poi_craft_rigger">Gréeur</string>
+	<string name="poi_craft_pottery">Poterie artisanale</string>
+	<string name="poi_craft_plasterer">Plâtrier</string>
+	<string name="poi_craft_painter">Peintre en bâtiment</string>
+	<string name="poi_craft_handicraft">Artisanat</string>
+	<string name="poi_craft_glaziery">Vitrerie artisanale</string>
+	<string name="poi_craft_gardener">Jardinier</string>
+	<string name="poi_craft_dressmaker">Couturière</string>
+	<string name="poi_craft_caterer">Traiteur</string>
+	<string name="poi_craft_bookbinder">Relieur</string>
+	<string name="poi_craft_beekeeper">Apiculteur</string>
+	<string name="poi_craft_basket_maker">Vannier</string>
+	<string name="poi_craft_agricultural_engines">Engins agricoles</string>
 	<string name="poi_community_centre">Centre communautaire</string>
 	<string name="poi_club_photography">Club de photographie</string>
 	<string name="poi_hot_spring">Source d\'eau chaude</string>
@@ -535,23 +533,22 @@
 	<string name="poi_telephone_exchange">Central téléphonique</string>
 
 	<string name="poi_power_transformer">Transformateur électrique</string>
-	<string name="poi_motorcycle_shop">Magasin de motos</string>
-	<string name="poi_frame_shop">Magasin d\'encadrement</string>
-	<string name="poi_bathroom_furnishing_shop">Magasin d\'équipement pour la salle de bain</string>
-	<string name="poi_bed_shop">Magasin d\'équipement pour la chambre</string>
-	<string name="poi_children_clothes_shop">Vêtements pour enfants</string>
-	<string name="poi_curtain_shop">Boutique de rideaux</string>
+	<string name="poi_motorcycle">Magasin de motos</string>
+	<string name="poi_frame">Magasin d\'encadrement</string>
+	<string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string>
+	<string name="poi_bed">Magasin d\'équipement pour la chambre</string>
+	<string name="poi_children_clothes">Vêtements pour enfants</string>
+	<string name="poi_curtain">Boutique de rideaux</string>
 	<string name="poi_dairy">Crèmerie</string>
 	<string name="poi_baby_goods">Articles pour bébé</string>
-	<string name="poi_doityourself_shop">Magasin de domotique</string>
-	<string name="poi_gas_shop">Magasin de gaz liquéfié</string>
-	<string name="poi_houseware_shop">Magasin de fournitures ménagères</string>
-	<string name="poi_paint_shop">Magasin de peinture</string>
-	<string name="poi_radiotechnics_shop">Magasin de matériel radio</string>
-	<string name="poi_trade_shop">Poste de traite</string>
-	<string name="poi_window_blind_shop">Magasin de persiennes</string>
-	<string name="poi_atv_shop">Magasin de quads</string>
-	<string name="poi_sewing_shop">Magasin de vêtements</string>
+	<string name="poi_gas">Magasin de gaz liquéfié</string>
+	<string name="poi_houseware">Magasin de fournitures ménagères</string>
+	<string name="poi_paint">Magasin de peinture</string>
+	<string name="poi_radiotechnics">Magasin de matériel radio</string>
+	<string name="poi_trade">Poste de traite</string>
+	<string name="poi_window_blind">Magasin de persiennes</string>
+	<string name="poi_atv">Magasin de quads</string>
+	<string name="poi_sewing">Magasin de vêtements</string>
 
 	<string name="poi_fire_flapper">Pelle à feu</string>
 	<string name="poi_fire_water_pond">Réserve d\'eau incendie</string>
@@ -584,9 +581,9 @@
 	<string name="poi_city_gate">Porte de ville</string>
 	<string name="poi_club_board_games">Club de jeux de société</string>
 	<string name="poi_club_veterans">Association de vétérans</string>
-	<string name="poi_blacksmith">Forgeron</string>
-	<string name="poi_sweep">Ramoneur</string>
-	<string name="poi_tinsmith">Ferronnier</string>
+	<string name="poi_craft_blacksmith">Forgeron</string>
+	<string name="poi_craft_sweep">Ramoneur</string>
+	<string name="poi_craft_tinsmith">Ferronnier</string>
 	<string name="poi_dock">Quai</string>
 	<string name="poi_mortuary">Funérarium</string>
 	<string name="poi_seamark_pile">Tourelle</string>
@@ -596,7 +593,7 @@
 	<string name="poi_seamark_radio_station">Station radio (amer)</string>
 	<string name="poi_seamark_signal_station_traffic">Sémaphore</string>
 	<string name="poi_attraction_animal">Parc animalier</string>
-	<string name="poi_ferris_wheel">Grande roue</string>
+	<string name="poi_big_wheel">Grande roue</string>
 	<string name="poi_carousel">Carrousel</string>
 	<string name="poi_maze">Labyrinthe</string>
 	<string name="poi_roller_coaster">Montagnes russes</string>
@@ -615,21 +612,21 @@
 	<string name="poi_club_ethnic">Club ethnique</string>
 	<string name="poi_club_nature">Club nature</string>
 	<string name="poi_club_tourism">Club de tourisme</string>
-	<string name="poi_hvac">Chauffage, ventilation, air conditionné</string>
-	<string name="poi_insulation_craft">Isolation</string>
-	<string name="poi_metal_construction_craft">Artisan ferronnier</string>
-	<string name="poi_stand_builder">Constructeur de stand</string>
-	<string name="poi_sun_protection_craft">Protection solaire artisanale</string>
-	<string name="poi_window_construction">Construction de fenêtres</string>
+	<string name="poi_craft_hvac">Chauffage, ventilation, air conditionné</string>
+	<string name="poi_craft_insulation">Isolation</string>
+	<string name="poi_craft_metal_construction">Artisan ferronnier</string>
+	<string name="poi_craft_stand_builder">Constructeur de stand</string>
+	<string name="poi_craft_sun_protection">Protection solaire artisanale</string>
+	<string name="poi_craft_window_construction">Construction de fenêtres</string>
 
-	<string name="poi_computer_craft">Assembleur d\'ordinateurs</string>
+	<string name="poi_craft_computer">Assembleur d\'ordinateurs</string>
 	<string name="poi_seamark_daymark">Amer</string>
 	<string name="poi_seamark_notice">Signalétique maritime</string>
 	<string name="poi_seamark_signal_station_warning">Station de signaux, avertissements</string>
 	<string name="poi_seamark_small_craft_facility">Facilité pour petites embarcations</string>
 	<string name="poi_military_nuclear_explosion_site">Site d\'essais nucléaires</string>
-<string name="poi_carpet_layer">Couvreur de moquettes</string>
-	<string name="poi_parquet_layer">Couvreur de parquets</string>
+<string name="poi_craft_carpet_layer">Couvreur de moquettes</string>
+	<string name="poi_craft_parquet_layer">Couvreur de parquets</string>
 	<string name="poi_saddle">Selle</string>
 	<string name="poi_tower">Tour</string>
 	<string name="poi_mast">Mât</string>
@@ -658,8 +655,7 @@
 	<string name="poi_farm">Vente à la ferme</string>
 	<string name="poi_wine">Caviste</string>
 
-	<string name="poi_child_clothes_shop">Vêtements pour enfants</string>
-	<string name="poi_general">Magasin général</string>
+	<string name="poi_child_clothes">Vêtements pour enfants</string>
 	<string name="poi_car">Concessionnaire automobile</string>
 	<string name="poi_car_parts">Pièces automobiles</string>
 	<string name="poi_public_transport_stop_position">Arrêt de transports en commun</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 25cbaa77b7..09c20fc6f9 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -564,7 +564,7 @@
   <string name="search_online_address">Internet</string>
   <string name="max_level_download_tile">Niveau de zoom maximum</string>
   <string name="max_level_download_tile_descr">Choisir un niveau de zoom maximum pour le téléchargement</string>
-  <string name="route_general_information">Distance totale : %1$s,\n durée estimée : %2$d h %3$d m.</string>
+  <string name="route_general_information">Distance totale : %1$s, temps de trajet estimé : %2$d h %3$d m.</string>
   <string name="router_service_descr">Sélectionner un service de navigation, hors-ligne ou en ligne</string>
   <string name="router_service">Service de navigation</string>
   <string name="sd_dir_not_accessible">Le dossier contenant les données sur la carte SD est inaccessible !</string>
@@ -1985,4 +1985,10 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="waypoint_visit_after">Visiter après</string>
     <string name="waypoint_visit_before">Visiter avant</string>
     <string name="shared_string_collapse">Réduire</string>
-	</resources>
+	<string name="action_create">Action créer</string>
+	<string name="action_modify">Action modifier</string>
+	<string name="action_delete">Action supprimer</string>
+	<string name="osm_edits">Éditions OSM</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Restant</string> <string name="parking_place_limited">Stationnement à durée limitée</string>
+	<string name="your_edits">Vos modifications</string>
+    </resources>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 035c5ccb87..466caa2f6d 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -11,46 +11,46 @@
 	<string name="poi_supermarket">Supermercado</string>
 	<string name="poi_shop_tea">Tetería</string>
 	<string name="poi_dairy">Leitería</string>
-	<string name="poi_bookshop">Libraría</string>
-	<string name="poi_bicycle_shop">Tenda de bicicletas</string>
-	<string name="poi_antiques_shop">Tenda de antigüidades</string>
-	<string name="poi_art_shop">Tenda de arte</string>
+	<string name="poi_books">Libraría</string>
+	<string name="poi_bicycle">Tenda de bicicletas</string>
+	<string name="poi_antiques">Tenda de antigüidades</string>
+	<string name="poi_art">Tenda de arte</string>
 	<string name="poi_boutique">Tenda de moda</string>
-	<string name="poi_carpet_shop">Tenda de alfombras</string>
-	<string name="poi_children_clothes_shop">Roupa infantil</string>
+	<string name="poi_carpet">Tenda de alfombras</string>
+	<string name="poi_children_clothes">Roupa infantil</string>
 	<string name="poi_shoes">Zapataría</string>
-	<string name="poi_computer_shop">Tenda de informática</string>
+	<string name="poi_computer">Tenda de informática</string>
 	<string name="poi_copyshop">Copistaría</string>
-	<string name="poi_curtain_shop">Tenda de cortinas</string>
-	<string name="poi_dive_shop">Equipamento de mergullo</string>
-	<string name="poi_erotic_shop">Tenda erótica</string>
+	<string name="poi_curtain">Tenda de cortinas</string>
+	<string name="poi_dive">Equipamento de mergullo</string>
+	<string name="poi_erotic">Tenda erótica</string>
 	<string name="poi_florist">Floraría</string>
-	<string name="poi_furniture_shop">Moblaría</string>
+	<string name="poi_furniture">Moblaría</string>
 	<string name="poi_garden_centre">Tenda para o xardín</string>
-	<string name="poi_gift_shop">Tenda de regalos</string>
-	<string name="poi_hunting_shop">Equipamento para a caza</string>
-	<string name="poi_interior_decoration_shop">Tenda de decoración interior</string>
-	<string name="poi_jewelry_shop">Xoiaría</string>
+	<string name="poi_gift">Tenda de regalos</string>
+	<string name="poi_hunting">Equipamento para a caza</string>
+	<string name="poi_interior_decoration">Tenda de decoración interior</string>
+	<string name="poi_jewelry">Xoiaría</string>
 	<string name="poi_kiosk">Quiosque</string>
-	<string name="poi_kitchen_shop">Material de cociña</string>
-	<string name="poi_mobile_phone_shop">Tenda de telefonía móbil</string>
-	<string name="poi_motorcycle_shop">Tenda de motos</string>
-	<string name="poi_musical_instrument_shop">Instrumentos musicais</string>
-	<string name="poi_newsagent_shop">Axencia de noticias</string>
-	<string name="poi_organic_shop">Comida ecolóxica</string>
-	<string name="poi_paint_shop">Tenda de pinturas</string>
-	<string name="poi_pet_shop">Tenda de animais</string>
+	<string name="poi_kitchen">Material de cociña</string>
+	<string name="poi_mobile_phone">Tenda de telefonía móbil</string>
+	<string name="poi_motorcycle">Tenda de motos</string>
+	<string name="poi_musical_instrument">Instrumentos musicais</string>
+	<string name="poi_newsagent">Axencia de noticias</string>
+	<string name="poi_organic">Comida ecolóxica</string>
+	<string name="poi_paint">Tenda de pinturas</string>
+	<string name="poi_pet">Tenda de animais</string>
 	<string name="poi_second_hand">Tenda de segunda man</string>
-	<string name="poi_sports_shop">Material de deporte</string>
-	<string name="poi_stationery_shop">Papelaría</string>
-	<string name="poi_tobacco_shop">Estanco</string>
-	<string name="poi_toys_shop">Xoguetaría</string>
-	<string name="poi_vacuum_cleaner_shop">Tenda de aspiradoras</string>
+	<string name="poi_sports">Material de deporte</string>
+	<string name="poi_stationery">Papelaría</string>
+	<string name="poi_tobacco">Estanco</string>
+	<string name="poi_toys">Xoguetaría</string>
+	<string name="poi_vacuum_cleaner">Tenda de aspiradoras</string>
 	<string name="poi_department_store">Grandes almacéns</string>
-	<string name="poi_electronics_shop">Tenda de electrónica</string>
+	<string name="poi_electronics">Tenda de electrónica</string>
 	<string name="poi_car_parts_shop">Recambios de automóbil</string>
-	<string name="poi_atv_shop">Tenda de quads</string>
-	<string name="poi_cosmetics_shop">Cosméticos</string>
+	<string name="poi_atv">Tenda de quads</string>
+	<string name="poi_cosmetics">Cosméticos</string>
 	<string name="poi_marketplace">Mercado</string>
 	<string name="poi_police">Policía</string>
 	<string name="poi_fire_station">Bombeiros</string>
@@ -78,7 +78,7 @@
 	<string name="poi_public_transport_platform_trolleybus">Parada de trolebús</string>
 	<string name="poi_public_transport_platform_tram">Parada de tranvía</string>
 	<string name="poi_public_transport_station">Estación de transporte público</string>
-	<string name="poi_subway_entrance">Entrada de metro</string>
+	<string name="poi_railway_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estación de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
 
@@ -135,7 +135,7 @@
 	<string name="poi_prosecutor">Fiscal</string>
 	<string name="poi_migration">Emigración</string>
 	<string name="poi_tax_inspection">Inspección de Facenda</string>
-	<string name="poi_administrative_office">Oficina administrativa</string>
+	<string name="poi_office_administrative">Oficina administrativa</string>
 	<string name="poi_customs">Alfándega</string>
 	<string name="poi_city">Cidade</string>
 	<string name="poi_town">Vila</string>
@@ -165,11 +165,11 @@
 	<string name="poi_insurance">Seguros</string>
 	<string name="poi_estate_agent">Inmobiliaria</string>
 	<string name="poi_lawyer">Avogado</string>
-	<string name="poi_telecommunication_office">Oficina de telecomunicacións</string>
+	<string name="poi_office_telecommunication">Oficina de telecomunicacións</string>
 	<string name="poi_ngo">ONG</string>
 	<string name="poi_town_hall">Casa do Concello</string>
 	<string name="poi_employment_agency">Oficina de emprego</string>
-	<string name="poi_research_office">Oficina de investigación</string>
+	<string name="poi_research">Oficina de investigación</string>
 	<string name="poi_advertising_agency">Axencia de publicidade</string>
 	<string name="poi_educational_institution">Centro educativo</string>
 	<string name="poi_studio">Estudio</string>
@@ -224,7 +224,7 @@
 	<string name="poi_city_gate">Porta de cidade</string>
 	<string name="poi_fort">Forte</string>
 	<string name="poi_fountain">Fonte</string>
-	<string name="poi_ruins_historic">Ruínas históricas</string>
+	<string name="poi_historic_ruins">Ruínas históricas</string>
 	<string name="poi_monument">Monumento</string>
 	<string name="poi_zoo">Zoo</string>
 	<string name="poi_theme_park">Parque temático</string>
@@ -236,18 +236,18 @@
 	<string name="poi_chalet">Chalet</string>
 
 	<string name="poi_place_of_worship">Lugar de culto</string>
-	<string name="poi_place_of_worship_christian">Lugar de culto: cristián</string>
-	<string name="poi_place_of_worship_jewish">Lugar de culto: xudeo</string>
-	<string name="poi_place_of_worship_muslim">Lugar de cultu: musulmán</string>
-	<string name="poi_place_of_worship_sikh">Lugar de culto: sikh</string>
-	<string name="poi_place_of_worship_buddhist">Lugar de culto: budista</string>
-	<string name="poi_place_of_worship_hindu">Lugar de culto: hindú</string>
-	<string name="poi_place_of_worship_shinto">Lugar de culto: xintoísta</string>
-	<string name="poi_place_of_worship_taoist">Lugar de culto: taoísta</string>
+	<string name="poi_religion_christian">Lugar de culto: cristián</string>
+	<string name="poi_religion_jewish">Lugar de culto: xudeo</string>
+	<string name="poi_religion_muslim">Lugar de cultu: musulmán</string>
+	<string name="poi_religion_sikh">Lugar de culto: sikh</string>
+	<string name="poi_religion_buddhist">Lugar de culto: budista</string>
+	<string name="poi_religion_hindu">Lugar de culto: hindú</string>
+	<string name="poi_religion_shinto">Lugar de culto: xintoísta</string>
+	<string name="poi_religion_taoist">Lugar de culto: taoísta</string>
 	<string name="poi_monastery">Mosteiro</string>
 	<string name="poi_historic_monastery">Mosteiro histórico</string>
 	<string name="poi_wayside_cross">Cruceiro</string>
-	<string name="poi_tourism_information">Información turística</string>
+	<string name="poi_information">Información turística</string>
 	<string name="poi_clock">Reloxo</string>
 	<string name="poi_travel_agent">Axencia de viaxes</string>
 	<string name="poi_camp_site">Cámping</string>
@@ -287,7 +287,7 @@
 	<string name="poi_circus">Circo</string>
 	<string name="poi_dance_floor">Salón de baile</string>
 	<string name="poi_nightclub">Pub</string>
-	<string name="poi_fishing_place">Couto pesqueiro</string>
+	<string name="poi_leisure_fishing">Couto pesqueiro</string>
 	<string name="poi_miniature_golf">Minigolf</string>
 	<string name="poi_playground">Parque infantil</string>
 	<string name="poi_swimming_pool">Piscina</string>
@@ -303,31 +303,31 @@
 	<string name="poi_drinking_water">Auga potábel</string>
 	<string name="poi_barbecue">Barbacoa</string>
 
-	<string name="poi_blacksmith">Ferreiro</string>
-	<string name="poi_brewery">Fábrica de cervexa</string>
-	<string name="poi_carpenter">Carpintaría</string>
-	<string name="poi_clockmaker">Reloxaría</string>
-	<string name="poi_dressmaker">Modista</string>
-	<string name="poi_electrician">Electricista</string>
-	<string name="poi_gardener">Xardineiro</string>
-	<string name="poi_handicraft">Manualidades</string>
-	<string name="poi_hvac">Calefacción, ventilación, ar acondicionado</string>
-	<string name="poi_insulation_craft">Illamento</string>
-	<string name="poi_jeweller">Xoeiro</string>
-	<string name="poi_painter">Pintor</string>
-	<string name="poi_photographer">Fotógrafo</string>
-	<string name="poi_photographic_laboratory">Laboratorio fotográfico</string>
-	<string name="poi_plumber">Fontaneiro</string>
-	<string name="poi_pottery_craft">Oleiro</string>
-	<string name="poi_roofer">Tellador</string>
-	<string name="poi_sculptor">Escultor</string>
-	<string name="poi_shoemaker">Zapateiro</string>
-	<string name="poi_stonemason">Canteiro</string>
-	<string name="poi_tailor">Xastre</string>
-	<string name="poi_watchmaker">Reloxeiro</string>
+	<string name="poi_craft_blacksmith">Ferreiro</string>
+	<string name="poi_craft_brewery">Fábrica de cervexa</string>
+	<string name="poi_craft_carpenter">Carpintaría</string>
+	<string name="poi_craft_clockmaker">Reloxaría</string>
+	<string name="poi_craft_dressmaker">Modista</string>
+	<string name="poi_craft_electrician">Electricista</string>
+	<string name="poi_craft_gardener">Xardineiro</string>
+	<string name="poi_craft_handicraft">Manualidades</string>
+	<string name="poi_craft_hvac">Calefacción, ventilación, ar acondicionado</string>
+	<string name="poi_craft_insulation">Illamento</string>
+	<string name="poi_craft_jeweller">Xoeiro</string>
+	<string name="poi_craft_painter">Pintor</string>
+	<string name="poi_craft_photographer">Fotógrafo</string>
+	<string name="poi_craft_photographic_laboratory">Laboratorio fotográfico</string>
+	<string name="poi_craft_plumber">Fontaneiro</string>
+	<string name="poi_craft_pottery">Oleiro</string>
+	<string name="poi_craft_roofer">Tellador</string>
+	<string name="poi_craft_sculptor">Escultor</string>
+	<string name="poi_craft_shoemaker">Zapateiro</string>
+	<string name="poi_craft_stonemason">Canteiro</string>
+	<string name="poi_craft_tailor">Xastre</string>
+	<string name="poi_craft_watchmaker">Reloxeiro</string>
 	<string name="poi_funeral_directors">Tanatorio</string>
-	<string name="poi_computer_craft">Material informático</string>
-	<string name="poi_beauty_salon">Salón de beleza</string>
+	<string name="poi_craft_computer">Material informático</string>
+	<string name="poi_beauty">Salón de beleza</string>
 	<string name="poi_beauty_salon_nails">Salón de uñas</string>
 	<string name="poi_hairdresser">Perruquería</string>
 	<string name="poi_massage">Salón de masaxes</string>
@@ -347,7 +347,7 @@
 	<string name="poi_money_lender">Prestamista</string>
 	<string name="poi_currencyexchange">Oficina de cambio</string>
 	<string name="poi_accountant">Contábel</string>
-	<string name="poi_bitcoin_yes">Pagamento con bitcoin</string>
+	<string name="poi_bitcoin">Pagamento con bitcoin</string>
 
 	<string name="poi_cave_entrance">Entrada de cova</string>
 	<string name="poi_peak">Cumio de montaña</string>
@@ -379,7 +379,7 @@
 	<string name="poi_military_danger_area">Zona perigosa</string>
 	<string name="poi_military_range">Campo de tiro militar</string>
 	<string name="poi_military_naval_base">Base naval militar</string>
-	<string name="poi_anime_shop">Tenda de anime</string>
-	<string name="poi_bag_shop">Tenda de bolsos</string>
-	<string name="poi_hardware_shop">Ferraxería</string>
+	<string name="poi_anime">Tenda de anime</string>
+	<string name="poi_bag">Tenda de bolsos</string>
+	<string name="poi_hardware">Ferraxería</string>
 	</resources>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 993a76d854..8385cc65cb 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -17,22 +17,22 @@
 	<string name="poi_dairy">Tejtermék bolt</string>
 	<string name="poi_vending_machine">Árusító automata</string>
 
-	<string name="poi_bookshop">Könyvesbolt</string>
-	<string name="poi_bicycle_shop">Kerékpárbolt</string>
-	<string name="poi_anime_shop">Anime bolt</string>
-	<string name="poi_antiques_shop">Antikvárius</string>
-	<string name="poi_chemist_shop">Drogéria</string>
+	<string name="poi_books">Könyvesbolt</string>
+	<string name="poi_bicycle">Kerékpárbolt</string>
+	<string name="poi_anime">Anime bolt</string>
+	<string name="poi_antiques">Antikvárius</string>
+	<string name="poi_chemist">Drogéria</string>
 	<string name="poi_copyshop">Fénymásoló</string>
 	<string name="poi_florist">Virágárus</string>
 	<string name="poi_garden_centre">Kertészet</string>
-	<string name="poi_gift_shop">Ajándékbolt</string>
-	<string name="poi_hardware_shop">Háztartási bolt</string>
-	<string name="poi_jewelry_shop">Ékszerbolt</string>
-	<string name="poi_motorcycle_shop">Motorkerékpár kereskedés</string>
-	<string name="poi_sports_shop">Sportbolt</string>
-	<string name="poi_ticket_shop">Jegyárus</string>
-	<string name="poi_tobacco_shop">Dohánybolt</string>
-	<string name="poi_toys_shop">Játékbolt</string>
+	<string name="poi_gift">Ajándékbolt</string>
+	<string name="poi_hardware">Háztartási bolt</string>
+	<string name="poi_jewelry">Ékszerbolt</string>
+	<string name="poi_motorcycle">Motorkerékpár kereskedés</string>
+	<string name="poi_sports">Sportbolt</string>
+	<string name="poi_ticket">Jegyárus</string>
+	<string name="poi_tobacco">Dohánybolt</string>
+	<string name="poi_toys">Játékbolt</string>
 	<string name="poi_variety_store">100 forintos bolt</string>
 	<string name="poi_department_store">Áruház</string>
 	<string name="poi_car_shop">Autókereskedés</string>
@@ -67,7 +67,7 @@
 	<string name="poi_public_transport_platform_bus">Buszmegálló</string>
 	<string name="poi_public_transport_platform_trolleybus">Trolimegálló</string>
 	<string name="poi_public_transport_platform_tram">Villamosmegálló</string>
-	<string name="poi_subway_entrance">Metró lejárat</string>
+	<string name="poi_railway_subway_entrance">Metró lejárat</string>
 	<string name="poi_subway_station">Metrómegálló</string>
 	<string name="poi_taxi">Taxidroszt</string>
 
@@ -137,7 +137,7 @@
 	<string name="poi_city_gate">Városkapu</string>
 	<string name="poi_fort">Erőd</string>
 	<string name="poi_fountain">Szökőkút</string>
-	<string name="poi_ruins_historic">Romok</string>
+	<string name="poi_historic_ruins">Romok</string>
 	<string name="poi_monument">Műemlék</string>
 	<string name="poi_zoo">Állatkert</string>
 	<string name="poi_theme_park">Vidámpark</string>
@@ -147,17 +147,17 @@
 	<string name="poi_motel">Motel</string>
 	<string name="poi_alpine_hut">Menedékház</string>
 	<string name="poi_place_of_worship">Istentiszteleti hely</string>
-	<string name="poi_place_of_worship_christian">Istentiszteleti hely: keresztény</string>
-	<string name="poi_place_of_worship_jewish">Istentiszteleti hely: zsidó</string>
-	<string name="poi_place_of_worship_muslim">Istentiszteleti hely: muszlim</string>
-	<string name="poi_place_of_worship_sikh">Istentiszteleti hely: szikh</string>
-	<string name="poi_place_of_worship_buddhist">Istentiszteleti hely: buddhista</string>
-	<string name="poi_place_of_worship_hindu">Istentiszteleti hely: hindu</string>
-	<string name="poi_place_of_worship_shinto">Istentiszteleti hely: sintoista</string>
-	<string name="poi_place_of_worship_taoist">Istentiszteleti hely: taoista</string>
+	<string name="poi_religion_christian">Istentiszteleti hely: keresztény</string>
+	<string name="poi_religion_jewish">Istentiszteleti hely: zsidó</string>
+	<string name="poi_religion_muslim">Istentiszteleti hely: muszlim</string>
+	<string name="poi_religion_sikh">Istentiszteleti hely: szikh</string>
+	<string name="poi_religion_buddhist">Istentiszteleti hely: buddhista</string>
+	<string name="poi_religion_hindu">Istentiszteleti hely: hindu</string>
+	<string name="poi_religion_shinto">Istentiszteleti hely: sintoista</string>
+	<string name="poi_religion_taoist">Istentiszteleti hely: taoista</string>
 	<string name="poi_monastery">Kolostor</string>
 	<string name="poi_wayside_cross">Útmenti kereszt</string>
-	<string name="poi_tourism_information">Turistainformáció</string>
+	<string name="poi_information">Turistainformáció</string>
 	<string name="poi_clock">Óra</string>
 	<string name="poi_viewpoint">Kilátóhely</string>
 	<string name="poi_camp_site">Kemping</string>
@@ -191,23 +191,23 @@
 	<string name="poi_bar">Bár</string>
 	<string name="poi_pub">Kocsma</string>
 	<string name="poi_drinking_water">Ivóvíz</string>
-	<string name="poi_beekeeper">Méhész</string>
-	<string name="poi_blacksmith">Patkolókovács</string>
-	<string name="poi_brewery">Sörfőzde</string>
-	<string name="poi_bookbinder">Könyvkötő</string>
-	<string name="poi_carpenter">Asztalos</string>
-	<string name="poi_clockmaker">Órás</string>
-	<string name="poi_dressmaker">Ruhakészítő</string>
-	<string name="poi_electrician">Villanyszerelő</string>
-	<string name="poi_gardener">Kertész</string>
-	<string name="poi_jeweller">Ékszerész</string>
-	<string name="poi_locksmith">Zárjavító</string>
-	<string name="poi_key_cutter">Kulcsmásoló</string>
-	<string name="poi_photographer">Fotográfus</string>
-	<string name="poi_photographic_laboratory">Fotólabor</string>
-	<string name="poi_plumber">Vízvezeték szerelő</string>
-	<string name="poi_roofer">Tetőfedő</string>
-	<string name="poi_shoemaker">Cipész</string>
+	<string name="poi_craft_beekeeper">Méhész</string>
+	<string name="poi_craft_blacksmith">Patkolókovács</string>
+	<string name="poi_craft_brewery">Sörfőzde</string>
+	<string name="poi_craft_bookbinder">Könyvkötő</string>
+	<string name="poi_craft_carpenter">Asztalos</string>
+	<string name="poi_craft_clockmaker">Órás</string>
+	<string name="poi_craft_dressmaker">Ruhakészítő</string>
+	<string name="poi_craft_electrician">Villanyszerelő</string>
+	<string name="poi_craft_gardener">Kertész</string>
+	<string name="poi_craft_jeweller">Ékszerész</string>
+	<string name="poi_craft_locksmith">Zárjavító</string>
+	<string name="poi_craft_key_cutter">Kulcsmásoló</string>
+	<string name="poi_craft_photographer">Fotográfus</string>
+	<string name="poi_craft_photographic_laboratory">Fotólabor</string>
+	<string name="poi_craft_plumber">Vízvezeték szerelő</string>
+	<string name="poi_craft_roofer">Tetőfedő</string>
+	<string name="poi_craft_shoemaker">Cipész</string>
 	<string name="poi_hairdresser">Fodrász</string>
 	<string name="poi_car_rental">Autókölcsönző</string>
 	<string name="poi_bank">Bank</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index aaa50a6548..d3228b0a83 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -2,10 +2,10 @@
 <resources><string name="poi_mall">Centro commerciale</string>
 	<string name="poi_seafood">Pescheria</string>
 	<string name="poi_supermarket">Supermercato</string>
-	<string name="poi_bicycle_shop">Negozio di biciclette</string>
+	<string name="poi_bicycle">Negozio di biciclette</string>
 	<string name="poi_vending_machine">Distributore automatico</string>
 
-	<string name="poi_bookshop">Libreria</string>
+	<string name="poi_books">Libreria</string>
 	<string name="poi_palaeontological_site">Sito paleontologico</string>
 
 	<string name="poi_bakery">Panificio</string>
@@ -20,31 +20,31 @@
 	<string name="poi_ice_cream">Gelateria</string>
 	<string name="poi_shop_tea">Negozio di té</string>
 	<string name="poi_dairy">Latteria</string>
-	<string name="poi_antiques_shop">Antiquariato</string>
-	<string name="poi_art_shop">Galleria d\'arte</string>
+	<string name="poi_antiques">Antiquariato</string>
+	<string name="poi_art">Galleria d\'arte</string>
 	<string name="poi_baby_goods">Articoli per l\'infanzia</string>
-	<string name="poi_bag_shop">Valigeria</string>
-	<string name="poi_bathroom_furnishing_shop">Arredo bagno</string>
-	<string name="poi_bed_shop">Arredamento camera da letto</string>
-	<string name="poi_carpet_shop">Negozio tappeti</string>
-	<string name="poi_chemist_shop">Farmacia</string>
-	<string name="poi_clothes_shop">Abbigliamento</string>
-	<string name="poi_children_clothes_shop">Abbigliamento bambini</string>
+	<string name="poi_bag">Valigeria</string>
+	<string name="poi_bathroom_furnishing">Arredo bagno</string>
+	<string name="poi_bed">Arredamento camera da letto</string>
+	<string name="poi_carpet">Negozio tappeti</string>
+	<string name="poi_chemist">Farmacia</string>
+	<string name="poi_clothes">Abbigliamento</string>
+	<string name="poi_children_clothes">Abbigliamento bambini</string>
 	<string name="poi_shoes">Negozio calzature</string>
-	<string name="poi_computer_shop">Negozio di computer</string>
+	<string name="poi_computer">Negozio di computer</string>
 	<string name="poi_copyshop">Copisteria</string>
-	<string name="poi_curtain_shop">Negozio campeggio</string>
-	<string name="poi_fabric_shop">Negozio drappeggi</string>
-	<string name="poi_bedding_shop">Negozio materassi</string>
-	<string name="poi_dive_shop">Negozio articoli per immersione</string>
-	<string name="poi_doityourself_shop">Negozio per fai-da-te</string>
-	<string name="poi_erotic_shop">Sexy shop</string>
-	<string name="poi_fishing_shop">Negozio pesca</string>
+	<string name="poi_curtain">Negozio campeggio</string>
+	<string name="poi_fabric">Negozio drappeggi</string>
+	<string name="poi_bedding">Negozio materassi</string>
+	<string name="poi_dive">Negozio articoli per immersione</string>
+	<string name="poi_doityourself">Negozio per fai-da-te</string>
+	<string name="poi_erotic">Sexy shop</string>
+	<string name="poi_fishing">Negozio pesca</string>
 	<string name="poi_florist">Fioreria / fiorista</string>
-	<string name="poi_frame_shop">Cornici</string>
-	<string name="poi_furniture_shop">Negozio mobili</string>
+	<string name="poi_frame">Cornici</string>
+	<string name="poi_furniture">Negozio mobili</string>
 	<string name="poi_garden_centre">Articoli per Giardinaggio</string>
-	<string name="poi_gas_shop">Negozio gas</string>
+	<string name="poi_gas">Negozio gas</string>
 	<string name="poi_ford">Guado</string>
 	<string name="poi_mountain_pass">Passo montano</string>
 	<string name="poi_gate">Ponte</string>
@@ -71,53 +71,53 @@
 	<string name="poi_public_transport_platform_tram">Fermata tram</string>
 	<string name="poi_public_transport_station">Stazione trasporto pubblico</string>
 	<string name="poi_bus_station">Stazione bus (obsoleto)</string>
-	<string name="poi_subway_entrance">Entrata metropolitana</string>
+	<string name="poi_railway_subway_entrance">Entrata metropolitana</string>
 	<string name="poi_subway_station">Stazione metropolitana</string>
 	<string name="poi_airport">Aeroporto</string>
 	<string name="poi_helipad">Eliporto</string>
 	<string name="poi_bicycle_rental">Noleggio bici</string>
 	<string name="poi_bicycle_parking">Parcheggio bici</string>
 
-	<string name="poi_anime_shop">Negozio anime</string>
+	<string name="poi_anime">Negozio anime</string>
 	<string name="poi_boutique">Boutique</string>
-	<string name="poi_general_shop">Emporio</string>
-	<string name="poi_gift_shop">Negozio regali</string>
-	<string name="poi_glaziery_shop">Vetreria</string>
-	<string name="poi_hardware_shop">Ferramenta</string>
-	<string name="poi_hearing_aids_shop">Negozi apparecchi acustici</string>
+	<string name="poi_general">Emporio</string>
+	<string name="poi_gift">Negozio regali</string>
+	<string name="poi_glaziery">Vetreria</string>
+	<string name="poi_hardware">Ferramenta</string>
+	<string name="poi_hearing_aids">Negozi apparecchi acustici</string>
 	<string name="poi_herbalist">Negozio erba</string>
-	<string name="poi_hifi_shop">Negozio di HiFi</string>
-	<string name="poi_hunting_shop">Negozio caccia-pesca</string>
-	<string name="poi_interior_decoration_shop">Negozio decorazione d\'interni</string>
-	<string name="poi_jewelry_shop">Gioielleria</string>
+	<string name="poi_hifi">Negozio di HiFi</string>
+	<string name="poi_hunting">Negozio caccia-pesca</string>
+	<string name="poi_interior_decoration">Negozio decorazione d\'interni</string>
+	<string name="poi_jewelry">Gioielleria</string>
 	<string name="poi_kiosk">Chiosco</string>
-	<string name="poi_kitchen_shop">Negozio articoli da cucina</string>
-	<string name="poi_mobile_phone_shop">Negozio telefonia mobile</string>
-	<string name="poi_motorcycle_shop">Negozio moto</string>
-	<string name="poi_musical_instrument_shop">Strumenti musicali</string>
+	<string name="poi_kitchen">Negozio articoli da cucina</string>
+	<string name="poi_mobile_phone">Negozio telefonia mobile</string>
+	<string name="poi_motorcycle">Negozio moto</string>
+	<string name="poi_musical_instrument">Strumenti musicali</string>
 	<string name="poi_optician_shop">Optometrista</string>
-	<string name="poi_organic_shop">Alimenti biologici</string>
-	<string name="poi_outdoor_shop">Negozio articoli per l\'attività all\'aperto</string>
-	<string name="poi_paint_shop">Negozio articoli per pittura</string>
-	<string name="poi_pet_shop">Negozio animali domestici</string>
+	<string name="poi_organic">Alimenti biologici</string>
+	<string name="poi_outdoor">Negozio articoli per l\'attività all\'aperto</string>
+	<string name="poi_paint">Negozio articoli per pittura</string>
+	<string name="poi_pet">Negozio animali domestici</string>
 	<string name="poi_second_hand">Negozio usato</string>
-	<string name="poi_tobacco_shop">Tabaccheria</string>
-	<string name="poi_toys_shop">Negozio giocattoli</string>
-	<string name="poi_houseware_shop">Nogozio casalinghi</string>
-	<string name="poi_newsagent_shop">Agenzia di stampa</string>
-	<string name="poi_radiotechnics_shop">Negozio per radiotecnica</string>
-	<string name="poi_sports_shop">Articoli sportivi</string>
-	<string name="poi_ticket_shop">Biglietteria</string>
-	<string name="poi_vacuum_cleaner_shop">Negozio aspirapolvere</string>
+	<string name="poi_tobacco">Tabaccheria</string>
+	<string name="poi_toys">Negozio giocattoli</string>
+	<string name="poi_houseware">Nogozio casalinghi</string>
+	<string name="poi_newsagent">Agenzia di stampa</string>
+	<string name="poi_radiotechnics">Negozio per radiotecnica</string>
+	<string name="poi_sports">Articoli sportivi</string>
+	<string name="poi_ticket">Biglietteria</string>
+	<string name="poi_vacuum_cleaner">Negozio aspirapolvere</string>
 	<string name="poi_variety_store">Negozi articoli a basso costo</string>
-	<string name="poi_video_shop">Videonoleggio</string>
-	<string name="poi_window_blind_shop">Negozio finestre cieche</string>
+	<string name="poi_video">Videonoleggio</string>
+	<string name="poi_window_blind">Negozio finestre cieche</string>
 	<string name="poi_department_store">Grande magazzino</string>
-	<string name="poi_electronics_shop">Negozio elettronica</string>
+	<string name="poi_electronics">Negozio elettronica</string>
 	<string name="poi_car_shop">Autosalone</string>
 	<string name="poi_car_parts_shop">Autoricambi</string>
-	<string name="poi_atv_shop">Negozio quad</string>
-	<string name="poi_cosmetics_shop">Negozio cosmetici</string>
+	<string name="poi_atv">Negozio quad</string>
+	<string name="poi_cosmetics">Negozio cosmetici</string>
 	<string name="poi_marketplace">Mercato</string>
 	<string name="poi_police">Polizia</string>
 	<string name="poi_fire_station">Pompieri</string>
@@ -126,8 +126,8 @@
 	<string name="poi_fire_extinguisher">Estintore</string>
 	<string name="poi_ambulance_station">Stazione ambulanze</string>
 	<string name="poi_ship_chandler">Negozio nautica</string>
-	<string name="poi_stationery_shop">Negozio per ufficio</string>
-	<string name="poi_tableware_shop">Negozio articoli per la tavola</string>
+	<string name="poi_stationery">Negozio per ufficio</string>
+	<string name="poi_tableware">Negozio articoli per la tavola</string>
 	<string name="poi_aeroway_gate">Gate aeroporto</string>
 
 	<string name="poi_aerialway_gondola">Gondola</string>
@@ -179,7 +179,7 @@
 	<string name="poi_bailiff">Ufficiale giudiziario</string>
 	<string name="poi_migration">Ufficio migrazione</string>
 	<string name="poi_tax_inspection">Guardia di finanza</string>
-	<string name="poi_administrative_office">Ufficio amministrativo</string>
+	<string name="poi_office_administrative">Ufficio amministrativo</string>
 	<string name="poi_city">Città capoluogo di provincia</string>
 	<string name="poi_town">Città</string>
 	<string name="poi_village">Paese</string>
@@ -260,7 +260,7 @@
 	<string name="poi_saddle">Sella</string>
 	<string name="poi_peak">Picco montuoso</string>
 	<string name="poi_cave_entrance">Entrata grotta/caverna</string>
-	<string name="poi_bitcoin_yes">Pagamento Bitcoin</string>
+	<string name="poi_bitcoin">Pagamento Bitcoin</string>
 
 	<string name="poi_atm">Bancomat</string>
 	<string name="poi_bank">Banca</string>
@@ -278,25 +278,25 @@
 	<string name="poi_massage">Centro massaggi</string>
 	<string name="poi_hairdresser">Parrucchiere</string>
 	<string name="poi_beauty_salon_nails">Centro unghie</string>
-	<string name="poi_beauty_salon">Salone di bellezza</string>
-	<string name="poi_window_construction">Costruzione finestre</string>
+	<string name="poi_beauty">Salone di bellezza</string>
+	<string name="poi_craft_window_construction">Costruzione finestre</string>
 
-	<string name="poi_watchmaker">Costruttore orologi</string>
-	<string name="poi_tailor">Sarto</string>
-	<string name="poi_shoemaker">Produzione calzature</string>
-	<string name="poi_sculptor">Scultore</string>
-	<string name="poi_plumber">Idraulico</string>
-	<string name="poi_photographic_laboratory">Laboratorio fotografico</string>
-	<string name="poi_photographer">Fotografo</string>
-	<string name="poi_parquet_layer">Posatore di parquet</string>
-	<string name="poi_painter">Pittore</string>
-	<string name="poi_optician">Ottico</string>
-	<string name="poi_jeweller">Gioielliere</string>
-	<string name="poi_hvac">Riscaldamento, ventilazione e condizionamento</string>
-	<string name="poi_gardener">Giardiniere</string>
-	<string name="poi_electrician">Elettricista</string>
-	<string name="poi_dressmaker">Sarto</string>
-	<string name="poi_place_of_worship_christian">Luogo di culto: cristiano</string>
+	<string name="poi_craft_watchmaker">Costruttore orologi</string>
+	<string name="poi_craft_tailor">Sarto</string>
+	<string name="poi_craft_shoemaker">Produzione calzature</string>
+	<string name="poi_craft_sculptor">Scultore</string>
+	<string name="poi_craft_plumber">Idraulico</string>
+	<string name="poi_craft_photographic_laboratory">Laboratorio fotografico</string>
+	<string name="poi_craft_photographer">Fotografo</string>
+	<string name="poi_craft_parquet_layer">Posatore di parquet</string>
+	<string name="poi_craft_painter">Pittore</string>
+	<string name="poi_craft_optician">Ottico</string>
+	<string name="poi_craft_jeweller">Gioielliere</string>
+	<string name="poi_craft_hvac">Riscaldamento, ventilazione e condizionamento</string>
+	<string name="poi_craft_gardener">Giardiniere</string>
+	<string name="poi_craft_electrician">Elettricista</string>
+	<string name="poi_craft_dressmaker">Sarto</string>
+	<string name="poi_religion_christian">Luogo di culto: cristiano</string>
 	<string name="poi_place_of_worship">Luogo di culto</string>
 	<string name="poi_chalet">Chalet</string>
 
@@ -311,7 +311,7 @@
 	<string name="poi_monument">Monumento</string>
 	<string name="poi_wreck">Relitto navale</string>
 	<string name="poi_rune_stone">Pietra runica</string>
-	<string name="poi_ruins_historic">Rovine storiche</string>
+	<string name="poi_historic_ruins">Rovine storiche</string>
 	<string name="poi_fountain">Fontana</string>
 	<string name="poi_fort">Forte</string>
 	<string name="poi_city_gate">Porta di ingresso della città</string>
@@ -396,15 +396,15 @@
 	<string name="poi_boules">Bocce</string>
 	<string name="poi_cycling">Ciclismo</string>
 	<string name="poi_gymnastics">Ginnastica</string>
-	<string name="poi_place_of_worship_buddhist">Luogo di culto: duddista</string>
-	<string name="poi_place_of_worship_hindu">Luogo di culto: induismo</string>
-	<string name="poi_place_of_worship_shinto">Luogo di culto: shintoismo</string>
-	<string name="poi_place_of_worship_taoist">Luogo di culto: taoismo</string>
+	<string name="poi_religion_buddhist">Luogo di culto: duddista</string>
+	<string name="poi_religion_hindu">Luogo di culto: induismo</string>
+	<string name="poi_religion_shinto">Luogo di culto: shintoismo</string>
+	<string name="poi_religion_taoist">Luogo di culto: taoismo</string>
 	<string name="poi_monastery">Monastero</string>
 	<string name="poi_historic_monastery">Monastero storico</string>
 	<string name="poi_wayside_cross">Croce storica</string>
 	<string name="poi_wayside_shrine">Tabernacolo storico</string>
-	<string name="poi_tourism_information">Informazioni turistiche</string>
+	<string name="poi_information">Informazioni turistiche</string>
 	<string name="poi_clock">Orologio</string>
 	<string name="poi_viewpoint">Punto panoramico</string>
 	<string name="poi_camp_site">Campeggio</string>
@@ -453,47 +453,47 @@
 	<string name="poi_drinking_water">Acqua potabile</string>
 	<string name="poi_barbecue">Barbecue</string>
 
-	<string name="poi_beekeeper">Apicoltore</string>
-	<string name="poi_blacksmith">Fabbro</string>
-	<string name="poi_brewery">Birrificio</string>
-	<string name="poi_boatbuilder">Costruzione barche</string>
-	<string name="poi_bookbinder">Rilegatore</string>
-	<string name="poi_carpenter">Carpentiere</string>
-	<string name="poi_carpet_layer">Posatore di moquette</string>
-	<string name="poi_caterer">Servizio di catering</string>
-	<string name="poi_clockmaker">Orologiaio</string>
-	<string name="poi_glaziery_craft">Vetraio</string>
-	<string name="poi_handicraft">Artigiano</string>
-	<string name="poi_insulation_craft">Isolamento termico degli edifici</string>
-	<string name="poi_locksmith">Fabbro per serrature</string>
-	<string name="poi_key_cutter">Servizio di duplicazione chiavi</string>
-	<string name="poi_metal_construction_craft">Costruzioni metalliche</string>
-	<string name="poi_plasterer">Stuccatore</string>
-	<string name="poi_pottery_craft">Vasaio</string>
-	<string name="poi_rigger">Attrezzature per barche a vela</string>
-	<string name="poi_roofer">Costruzione e riparazione di tetti</string>
-	<string name="poi_saddler">Sellaio</string>
-	<string name="poi_sailmaker">Velaio</string>
-	<string name="poi_sawmill">Segheria</string>
-	<string name="poi_scaffolder">Ponteggi e impalcature</string>
-	<string name="poi_stand_builder">Allestimento di stand</string>
-	<string name="poi_stonemason">Scalpellino</string>
-	<string name="poi_sweep">Spazzacamino</string>
-	<string name="poi_sun_protection_craft">Tende da sole</string>
-	<string name="poi_tiler">Piastrellista</string>
-	<string name="poi_tinsmith">Lattoniere</string>
-	<string name="poi_upholsterer">Tappezziere</string>
+	<string name="poi_craft_beekeeper">Apicoltore</string>
+	<string name="poi_craft_blacksmith">Fabbro</string>
+	<string name="poi_craft_brewery">Birrificio</string>
+	<string name="poi_craft_boatbuilder">Costruzione barche</string>
+	<string name="poi_craft_bookbinder">Rilegatore</string>
+	<string name="poi_craft_carpenter">Carpentiere</string>
+	<string name="poi_craft_carpet_layer">Posatore di moquette</string>
+	<string name="poi_craft_caterer">Servizio di catering</string>
+	<string name="poi_craft_clockmaker">Orologiaio</string>
+	<string name="poi_craft_glaziery">Vetraio</string>
+	<string name="poi_craft_handicraft">Artigiano</string>
+	<string name="poi_craft_insulation">Isolamento termico degli edifici</string>
+	<string name="poi_craft_locksmith">Fabbro per serrature</string>
+	<string name="poi_craft_key_cutter">Servizio di duplicazione chiavi</string>
+	<string name="poi_craft_metal_construction">Costruzioni metalliche</string>
+	<string name="poi_craft_plasterer">Stuccatore</string>
+	<string name="poi_craft_pottery">Vasaio</string>
+	<string name="poi_craft_rigger">Attrezzature per barche a vela</string>
+	<string name="poi_craft_roofer">Costruzione e riparazione di tetti</string>
+	<string name="poi_craft_saddler">Sellaio</string>
+	<string name="poi_craft_sailmaker">Velaio</string>
+	<string name="poi_craft_sawmill">Segheria</string>
+	<string name="poi_craft_scaffolder">Ponteggi e impalcature</string>
+	<string name="poi_craft_stand_builder">Allestimento di stand</string>
+	<string name="poi_craft_stonemason">Scalpellino</string>
+	<string name="poi_craft_sweep">Spazzacamino</string>
+	<string name="poi_craft_sun_protection">Tende da sole</string>
+	<string name="poi_craft_tiler">Piastrellista</string>
+	<string name="poi_craft_tinsmith">Lattoniere</string>
+	<string name="poi_craft_upholsterer">Tappezziere</string>
 	<string name="poi_funeral_directors">Impresa di pompe funebri</string>
 	<string name="poi_town_hall">Municipio</string>
-	<string name="poi_research_office">Centro di ricerca e sviluppo</string>
-	<string name="poi_it_office">Ufficio IT</string>
-	<string name="poi_newspaper_office">Redazione giornalistica</string>
-	<string name="poi_architect_office">Studio di architettura</string>
+	<string name="poi_research">Centro di ricerca e sviluppo</string>
+	<string name="poi_it">Ufficio IT</string>
+	<string name="poi_newspaper">Redazione giornalistica</string>
+	<string name="poi_architect">Studio di architettura</string>
 	<string name="poi_advertising_agency">Agenzia pubblicitaria</string>
 	<string name="poi_studio">Studio di registrazione</string>
-	<string name="poi_ship_historic">Nave storica</string>
-	<string name="poi_place_of_worship_muslim">Luogo di culto: musulmano</string>
-	<string name="poi_place_of_worship_sikh">Luogo di culto: sikhismo</string>
+	<string name="poi_historic_ship">Nave storica</string>
+	<string name="poi_religion_muslim">Luogo di culto: musulmano</string>
+	<string name="poi_religion_sikh">Luogo di culto: sikhismo</string>
 	<string name="poi_travel_agent">Agenzia di viaggi</string>
 	<string name="poi_cinema">Cinema</string>
 	<string name="poi_casino">Casinò</string>
@@ -511,7 +511,7 @@
 	<string name="poi_place_farm">Fattoria</string>
 
 	<string name="poi_occupational_therapist">Terapista occupazionale</string>
-	<string name="poi_telecommunication_office">Ufficio telecomunicazioni</string>
+	<string name="poi_office_telecommunication">Ufficio telecomunicazioni</string>
 	<string name="poi_american_football">Football americano</string>
 	<string name="poi_bmx_sport">BMX</string>
 	<string name="poi_taxi">Posteggio taxi</string>
@@ -536,19 +536,19 @@
 	<string name="poi_surfing">Surf</string>
 	<string name="poi_artwork">Opera d\'arte</string>
 	<string name="poi_cannon">Cannone storico</string>
-	<string name="poi_ferris_wheel">Ruota panoramica</string>
+	<string name="poi_big_wheel">Ruota panoramica</string>
 	<string name="poi_carousel">Giostra</string>
 	<string name="poi_maze">Labirinto</string>
 	<string name="poi_roller_coaster">Montagne russe</string>
 	<string name="poi_summer_toboggan">Toboga estivo</string>
-	<string name="poi_place_of_worship_jewish">Luogo di culto: ebreo</string>
+	<string name="poi_religion_jewish">Luogo di culto: ebreo</string>
 	<string name="poi_geyser">Geyser</string>
 	<string name="poi_arts_centre">Centro artistico</string>
-	<string name="poi_fishing_place">Postazione di pesca</string>
+	<string name="poi_leisure_fishing">Postazione di pesca</string>
 	<string name="poi_harbour">Porto</string>
 	<string name="poi_biergarten">Biergarten</string>
-	<string name="poi_agricultural_engines_craft">Motori agricoli</string>
-	<string name="poi_basket_maker">Cestaio</string>
+	<string name="poi_craft_agricultural_engines">Motori agricoli</string>
+	<string name="poi_craft_basket_maker">Cestaio</string>
 	<string name="poi_cape">Capo</string>
 	<string name="poi_strait">Stretto</string>
 	<string name="poi_seamark_anchorage">Ancoraggio</string>
@@ -556,6 +556,6 @@
 	<string name="poi_shop">Negozio</string>
 	<string name="poi_office">Ufficio</string>
 	<string name="poi_man_made">Artificiale</string>
-	<string name="poi_mine_historic">Miniera storica</string>
+	<string name="poi_historic_mine">Miniera storica</string>
 	<string name="poi_aquarium">Acquario</string>
 	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 63f333ebf7..a46726431b 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1903,8 +1903,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="save_track_interval_globally">Intervallo registrazione</string>
 	<string name="rendering_attr_publicTransportMode_name">Percorsi bus, filubus, servizi navetta</string>
 	<string name="confirm_every_run">Chiedi sempre</string>
-	<string name="save_global_track_interval_descr">Scegli l\'intervallo di tempo generale per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa)</string>
-	<string name="save_global_track_interval">Intervallo generale di registrazione</string>
+	<string name="save_global_track_interval_descr">Scegli l\'intervallo di tempo predefinito per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa)</string>
+	<string name="save_global_track_interval">Intervallo predefinito di registrazione</string>
 	<string name="traffic_warning_speed_limit">Limite di velocità</string>
     <string name="traffic_warning_payment">Casello</string>
     <string name="traffic_warning_border_control">Controllo doganale</string>
@@ -2140,4 +2140,10 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="waypoint_visit_after">Visita dopo</string>
     <string name="waypoint_visit_before">Visita prima</string>
     <string name="shared_string_collapse">Compatta</string>
-	</resources>
+	<string name="action_create">Azione crea</string>
+	<string name="action_modify">Azione modifica</string>
+	<string name="action_delete">Azione elimina</string>
+	<string name="osm_edits">Modifiche OSM</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Mancano</string> <string name="parking_place_limited">Parcheggio a tempo limitato</string>
+	<string name="your_edits">Le tue modifiche</string>
+    </resources>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 38988efc3c..5efb65a8b0 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -16,7 +16,7 @@
 	<string name="poi_pub">パブ（立ち吞み屋）</string>
 	<string name="poi_sauna">サウナ</string>
 	<string name="poi_school">学校</string>
-	<string name="poi_general_shop">店舗</string>
+	<string name="poi_general">店舗</string>
 	<string name="poi_taxi">タクシー乗り場</string>
 	<string name="poi_theme_park">テーマパーク</string>
 	<string name="poi_university">大学</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index c3b309692e..640d93b96a 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -18,79 +18,79 @@
 	<string name="poi_dairy">낙농장 상점</string>
 	<string name="poi_vending_machine">자동 판매기</string>
 
-	<string name="poi_bookshop">서점</string>
-	<string name="poi_bicycle_shop">자전거 가게</string>
-	<string name="poi_anime_shop">애니메이션 상점</string>
-	<string name="poi_antiques_shop">골동품 가게</string>
-	<string name="poi_art_shop">아트 숍</string>
+	<string name="poi_books">서점</string>
+	<string name="poi_bicycle">자전거 가게</string>
+	<string name="poi_anime">애니메이션 상점</string>
+	<string name="poi_antiques">골동품 가게</string>
+	<string name="poi_art">아트 숍</string>
 	<string name="poi_baby_goods">아기 상품</string>
-	<string name="poi_bag_shop">가방 가게</string>
-	<string name="poi_bathroom_furnishing_shop">욕실 가구</string>
-	<string name="poi_bed_shop">침대 룸 가구</string>
+	<string name="poi_bag">가방 가게</string>
+	<string name="poi_bathroom_furnishing">욕실 가구</string>
+	<string name="poi_bed">침대 룸 가구</string>
 	<string name="poi_boutique">패션 부티크</string>
-	<string name="poi_carpet_shop">카펫 가게</string>
-	<string name="poi_chemist_shop">약국</string>
-	<string name="poi_clothes_shop">의류 매장</string>
-	<string name="poi_children_clothes_shop">어린이 의류</string>
+	<string name="poi_carpet">카펫 가게</string>
+	<string name="poi_chemist">약국</string>
+	<string name="poi_clothes">의류 매장</string>
+	<string name="poi_children_clothes">어린이 의류</string>
 	<string name="poi_shoes">신발 가게</string>
-	<string name="poi_computer_shop">컴퓨터 가게</string>
+	<string name="poi_computer">컴퓨터 가게</string>
 	<string name="poi_copyshop">복사 가게</string>
-	<string name="poi_curtain_shop">커튼 가게</string>
-	<string name="poi_fabric_shop">휘장 상점</string>
-	<string name="poi_bedding_shop">침구 가게</string>
-	<string name="poi_dive_shop">다이빙 장비</string>
-	<string name="poi_doityourself_shop">주택 개선 가게</string>
-	<string name="poi_erotic_shop">에로틱 가게</string>
-	<string name="poi_fishing_shop">낚시 도구</string>
+	<string name="poi_curtain">커튼 가게</string>
+	<string name="poi_fabric">휘장 상점</string>
+	<string name="poi_bedding">침구 가게</string>
+	<string name="poi_dive">다이빙 장비</string>
+	<string name="poi_doityourself">주택 개선 가게</string>
+	<string name="poi_erotic">에로틱 가게</string>
+	<string name="poi_fishing">낚시 도구</string>
 	<string name="poi_florist">꽃 가게</string>
-	<string name="poi_frame_shop">그림 프레임 가게</string>
-	<string name="poi_furniture_shop">가구점</string>
+	<string name="poi_frame">그림 프레임 가게</string>
+	<string name="poi_furniture">가구점</string>
 	<string name="poi_garden_centre">정원 센터</string>
-	<string name="poi_gas_shop">LPG 주유소</string>
-	<string name="poi_general_shop">일반 상점</string>
-	<string name="poi_gift_shop">선물 가게</string>
-	<string name="poi_glaziery_shop">글라지어리</string>
-	<string name="poi_hardware_shop">하드웨어 스토어</string>
-	<string name="poi_hearing_aids_shop">청력 도움</string>
+	<string name="poi_gas">LPG 주유소</string>
+	<string name="poi_general">일반 상점</string>
+	<string name="poi_gift">선물 가게</string>
+	<string name="poi_glaziery">글라지어리</string>
+	<string name="poi_hardware">하드웨어 스토어</string>
+	<string name="poi_hearing_aids">청력 도움</string>
 	<string name="poi_herbalist">허브 상점</string>
-	<string name="poi_hifi_shop">고음질 스토어</string>
-	<string name="poi_houseware_shop">가정용품 공급 상점</string>
-	<string name="poi_hunting_shop">사냥 장비</string>
-	<string name="poi_interior_decoration_shop">실내 장식 가게</string>
-	<string name="poi_jewelry_shop">보석 상점</string>
+	<string name="poi_hifi">고음질 스토어</string>
+	<string name="poi_houseware">가정용품 공급 상점</string>
+	<string name="poi_hunting">사냥 장비</string>
+	<string name="poi_interior_decoration">실내 장식 가게</string>
+	<string name="poi_jewelry">보석 상점</string>
 	<string name="poi_kiosk">키오스크</string>
-	<string name="poi_kitchen_shop">부엌 가구</string>
-	<string name="poi_mobile_phone_shop">휴대 전화 가게</string>
-	<string name="poi_motorcycle_shop">오토바이 가게</string>
-	<string name="poi_musical_instrument_shop">악기</string>
-	<string name="poi_newsagent_shop">통신사</string>
+	<string name="poi_kitchen">부엌 가구</string>
+	<string name="poi_mobile_phone">휴대 전화 가게</string>
+	<string name="poi_motorcycle">오토바이 가게</string>
+	<string name="poi_musical_instrument">악기</string>
+	<string name="poi_newsagent">통신사</string>
 	<string name="poi_optician_shop">검안</string>
-	<string name="poi_organic_shop">유기농 식품</string>
-	<string name="poi_outdoor_shop">아웃도어 가게</string>
-	<string name="poi_paint_shop">페인트 샵</string>
-	<string name="poi_pet_shop">애완 동물 가게</string>
-	<string name="poi_radiotechnics_shop">전파상</string>
+	<string name="poi_organic">유기농 식품</string>
+	<string name="poi_outdoor">아웃도어 가게</string>
+	<string name="poi_paint">페인트 샵</string>
+	<string name="poi_pet">애완 동물 가게</string>
+	<string name="poi_radiotechnics">전파상</string>
 	<string name="poi_second_hand">두 번째 가게</string>
 	<string name="poi_ship_chandler">배 잡화상</string>
-	<string name="poi_sports_shop">스포츠 용품</string>
-	<string name="poi_stationery_shop">문구용품 가게</string>
-	<string name="poi_tableware_shop">식기 상점</string>
-	<string name="poi_ticket_shop">티켓 판매소</string>
-	<string name="poi_tobacco_shop">담배 상점</string>
-	<string name="poi_toys_shop">장난감 가게</string>
-	<string name="poi_trade_shop">무역소</string>
-	<string name="poi_vacuum_cleaner_shop">진공 청소기 가게</string>
+	<string name="poi_sports">스포츠 용품</string>
+	<string name="poi_stationery">문구용품 가게</string>
+	<string name="poi_tableware">식기 상점</string>
+	<string name="poi_ticket">티켓 판매소</string>
+	<string name="poi_tobacco">담배 상점</string>
+	<string name="poi_toys">장난감 가게</string>
+	<string name="poi_trade">무역소</string>
+	<string name="poi_vacuum_cleaner">진공 청소기 가게</string>
 	<string name="poi_variety_store">잡화점</string>
-	<string name="poi_video_shop">비디오 가게</string>
-	<string name="poi_window_blind_shop">창문 블라인드 가게</string>
+	<string name="poi_video">비디오 가게</string>
+	<string name="poi_window_blind">창문 블라인드 가게</string>
 	<string name="poi_department_store">백화점</string>
-	<string name="poi_electronics_shop">전자 제품 매장</string>
+	<string name="poi_electronics">전자 제품 매장</string>
 	<string name="poi_car_shop">자동차 판매소</string>
 	<string name="poi_car_parts_shop">자동차 부품</string>
-	<string name="poi_atv_shop">쿼드 가게</string>
-	<string name="poi_cosmetics_shop">화장품</string>
+	<string name="poi_atv">쿼드 가게</string>
+	<string name="poi_cosmetics">화장품</string>
 	<string name="poi_marketplace">마켓 플레이스</string>
-	<string name="poi_sewing_shop">건조 용품 가게</string>
+	<string name="poi_sewing">건조 용품 가게</string>
 
 	<string name="poi_police">경찰</string>
 	<string name="poi_fire_station">소방서</string>
@@ -142,7 +142,7 @@
 	<string name="poi_railway_station">기차역</string>
 	<string name="poi_railway_platform">철도 플랫폼</string>
 	<string name="poi_railway_halt">철도 정류장 (사용 되지 않음)</string>
-	<string name="poi_subway_entrance">지하철 입구</string>
+	<string name="poi_railway_subway_entrance">지하철 입구</string>
 	<string name="poi_subway_station">지하철 역</string>
 	<string name="poi_taxi">택시 승차장</string>
 
@@ -235,7 +235,7 @@
 	<string name="poi_pension_fund">연금 기금</string>
 	<string name="poi_migration">마이그레이션</string>
 	<string name="poi_tax_inspection">세금 검사</string>
-	<string name="poi_administrative_office">관리 사무실</string>
+	<string name="poi_office_administrative">관리 사무실</string>
 	<string name="poi_customs">세관</string>
 	<string name="poi_city">도시</string>
 	<string name="poi_town">도시</string>
@@ -276,14 +276,14 @@
 	<string name="poi_insurance">보험</string>
 	<string name="poi_estate_agent">부동산 중개인</string>
 	<string name="poi_lawyer">변호사</string>
-	<string name="poi_telecommunication_office">원거리 통신 사무실</string>
+	<string name="poi_office_telecommunication">원거리 통신 사무실</string>
 	<string name="poi_ngo">NGO</string>
 	<string name="poi_town_hall">타운 홀</string>
 	<string name="poi_employment_agency">Employment 사무실</string>
-	<string name="poi_research_office">연구 사무실</string>
-	<string name="poi_it_office">IT 사무실</string>
-	<string name="poi_newspaper_office">신문 사무실</string>
-	<string name="poi_architect_office">건축가 사무실</string>
+	<string name="poi_research">연구 사무실</string>
+	<string name="poi_it">IT 사무실</string>
+	<string name="poi_newspaper">신문 사무실</string>
+	<string name="poi_architect">건축가 사무실</string>
 	<string name="poi_advertising_agency">광고 대행사</string>
 	<string name="poi_educational_institution">교육 기관</string>
 	<string name="poi_studio">스튜디오</string>
@@ -367,11 +367,11 @@
 	<string name="poi_city_gate">시티 게이트</string>
 	<string name="poi_fort">요새</string>
 	<string name="poi_fountain">분수</string>
-	<string name="poi_ruins_historic">역사 유적</string>
+	<string name="poi_historic_ruins">역사 유적</string>
 	<string name="poi_rune_stone">룬 스톤</string>
 	<string name="poi_wreck">난파선</string>
-	<string name="poi_ship_historic">역사적인 배</string>
-	<string name="poi_mine_historic">유서깊은 광산</string>
+	<string name="poi_historic_ship">역사적인 배</string>
+	<string name="poi_historic_mine">유서깊은 광산</string>
 	<string name="poi_monument">기념물</string>
 	<string name="poi_zoo">동물원</string>
 	<string name="poi_theme_park">테마 파크</string>
@@ -384,19 +384,19 @@
 	<string name="poi_chalet">샬레</string>
 
 	<string name="poi_place_of_worship">예배 장소</string>
-	<string name="poi_place_of_worship_christian">예배 장소: 기독교</string>
-	<string name="poi_place_of_worship_jewish">예배 장소: 유대인</string>
-	<string name="poi_place_of_worship_muslim">예배 장소: 이슬람</string>
-	<string name="poi_place_of_worship_sikh">예배 장소: 시크교</string>
-	<string name="poi_place_of_worship_buddhist">예배 장소: 불교</string>
-	<string name="poi_place_of_worship_hindu">예배 장소: 힌두교</string>
-	<string name="poi_place_of_worship_shinto">예배 장소: 신도교</string>
-	<string name="poi_place_of_worship_taoist">예배 장소: 도교</string>
+	<string name="poi_religion_christian">예배 장소: 기독교</string>
+	<string name="poi_religion_jewish">예배 장소: 유대인</string>
+	<string name="poi_religion_muslim">예배 장소: 이슬람</string>
+	<string name="poi_religion_sikh">예배 장소: 시크교</string>
+	<string name="poi_religion_buddhist">예배 장소: 불교</string>
+	<string name="poi_religion_hindu">예배 장소: 힌두교</string>
+	<string name="poi_religion_shinto">예배 장소: 신도교</string>
+	<string name="poi_religion_taoist">예배 장소: 도교</string>
 	<string name="poi_monastery">수도원</string>
 	<string name="poi_historic_monastery">유서깊은 수도원</string>
 	<string name="poi_wayside_cross">크로스 길가</string>
 	<string name="poi_wayside_shrine">길가의 신사</string>
-	<string name="poi_tourism_information">도교 정보</string>
+	<string name="poi_information">도교 정보</string>
 	<string name="poi_clock">시계</string>
 	<string name="poi_travel_agent">여행사</string>
 	<string name="poi_viewpoint">관점</string>
@@ -456,7 +456,7 @@
 	<string name="poi_stripclub">스트립 클럽</string>
 	<string name="poi_beach_resort">비치 리조트</string>
 	<string name="poi_dog_park">강아지 공원</string>
-	<string name="poi_fishing_place">낚시 장소</string>
+	<string name="poi_leisure_fishing">낚시 장소</string>
 	<string name="poi_hunting_stand">헌팅 스탠드</string>
 	<string name="poi_marina">마리나</string>
 	<string name="poi_miniature_golf">미니 골프</string>
@@ -475,61 +475,61 @@
 	<string name="poi_drinking_water">식 수</string>
 	<string name="poi_barbecue">바베큐</string>
 
-	<string name="poi_agricultural_engines_craft">농업 엔진</string>
-	<string name="poi_basket_maker">바구니 메이커</string>
-	<string name="poi_beekeeper">양봉가</string>
-	<string name="poi_blacksmith">대장장이</string>
-	<string name="poi_brewery">양조장</string>
-	<string name="poi_boatbuilder">선박제조업자</string>
-	<string name="poi_bookbinder">북바인더</string>
-	<string name="poi_carpenter">목수</string>
-	<string name="poi_carpet_layer">카펫 레이어</string>
-	<string name="poi_caterer">요리사</string>
-	<string name="poi_clockmaker">시계제조업자</string>
-	<string name="poi_dressmaker">양장 제조업자</string>
-	<string name="poi_electrician">전기업자</string>
-	<string name="poi_gardener">정원사</string>
-	<string name="poi_glaziery_craft">Glaziery 공예</string>
-	<string name="poi_handicraft">수공예</string>
-	<string name="poi_hvac">난방, 환기, 공기 조화</string>
-	<string name="poi_insulation_craft">절연제</string>
-	<string name="poi_jeweller">보석상</string>
-	<string name="poi_locksmith">열쇠 업자</string>
-	<string name="poi_key_cutter">열쇠 커터</string>
-	<string name="poi_metal_construction_craft">금속 건축 공예</string>
-	<string name="poi_optician">안경점</string>
-	<string name="poi_painter">화가</string>
-	<string name="poi_parquet_layer">나무 마루 레이어</string>
-	<string name="poi_photographer">사진 작가</string>
-	<string name="poi_photographic_laboratory">사진 실험실</string>
-	<string name="poi_plasterer">미장</string>
-	<string name="poi_plumber">배관공</string>
-	<string name="poi_pottery_craft">도자기 공예</string>
-	<string name="poi_roofer">지붕 업자</string>
+	<string name="poi_craft_agricultural_engines">농업 엔진</string>
+	<string name="poi_craft_basket_maker">바구니 메이커</string>
+	<string name="poi_craft_beekeeper">양봉가</string>
+	<string name="poi_craft_blacksmith">대장장이</string>
+	<string name="poi_craft_brewery">양조장</string>
+	<string name="poi_craft_boatbuilder">선박제조업자</string>
+	<string name="poi_craft_bookbinder">북바인더</string>
+	<string name="poi_craft_carpenter">목수</string>
+	<string name="poi_craft_carpet_layer">카펫 레이어</string>
+	<string name="poi_craft_caterer">요리사</string>
+	<string name="poi_craft_clockmaker">시계제조업자</string>
+	<string name="poi_craft_dressmaker">양장 제조업자</string>
+	<string name="poi_craft_electrician">전기업자</string>
+	<string name="poi_craft_gardener">정원사</string>
+	<string name="poi_craft_glaziery">Glaziery 공예</string>
+	<string name="poi_craft_handicraft">수공예</string>
+	<string name="poi_craft_hvac">난방, 환기, 공기 조화</string>
+	<string name="poi_craft_insulation">절연제</string>
+	<string name="poi_craft_jeweller">보석상</string>
+	<string name="poi_craft_locksmith">열쇠 업자</string>
+	<string name="poi_craft_key_cutter">열쇠 커터</string>
+	<string name="poi_craft_metal_construction">금속 건축 공예</string>
+	<string name="poi_craft_optician">안경점</string>
+	<string name="poi_craft_painter">화가</string>
+	<string name="poi_craft_parquet_layer">나무 마루 레이어</string>
+	<string name="poi_craft_photographer">사진 작가</string>
+	<string name="poi_craft_photographic_laboratory">사진 실험실</string>
+	<string name="poi_craft_plasterer">미장</string>
+	<string name="poi_craft_plumber">배관공</string>
+	<string name="poi_craft_pottery">도자기 공예</string>
+	<string name="poi_craft_roofer">지붕 업자</string>
 	<string name="poi_grit_bin">그리트 빈</string>
-	<string name="poi_rigger">리거</string>
-	<string name="poi_saddler">새들러</string>
-	<string name="poi_sailmaker">Sail 메이커</string>
+	<string name="poi_craft_rigger">리거</string>
+	<string name="poi_craft_saddler">새들러</string>
+	<string name="poi_craft_sailmaker">Sail 메이커</string>
 	<string name="poi_cannon">역사적인 대포</string>
 	<string name="poi_harbour">항구</string>
-	<string name="poi_sawmill">제재소</string>
-	<string name="poi_scaffolder">스카프폴더</string>
-	<string name="poi_sculptor">조각가</string>
-	<string name="poi_shoemaker">구두 메이커</string>
-	<string name="poi_stand_builder">스탠드 빌더</string>
-	<string name="poi_stonemason">석공</string>
-	<string name="poi_sun_protection_craft">태양 보호 기술</string>
-	<string name="poi_sweep">스윕</string>
-	<string name="poi_tailor">재단사</string>
-	<string name="poi_tiler">벽돌공</string>
-	<string name="poi_tinsmith">양철공</string>
-	<string name="poi_upholsterer">실내</string>
-	<string name="poi_watchmaker">시계공</string>
-	<string name="poi_window_construction">창문 건설</string>
+	<string name="poi_craft_sawmill">제재소</string>
+	<string name="poi_craft_scaffolder">스카프폴더</string>
+	<string name="poi_craft_sculptor">조각가</string>
+	<string name="poi_craft_shoemaker">구두 메이커</string>
+	<string name="poi_craft_stand_builder">스탠드 빌더</string>
+	<string name="poi_craft_stonemason">석공</string>
+	<string name="poi_craft_sun_protection">태양 보호 기술</string>
+	<string name="poi_craft_sweep">스윕</string>
+	<string name="poi_craft_tailor">재단사</string>
+	<string name="poi_craft_tiler">벽돌공</string>
+	<string name="poi_craft_tinsmith">양철공</string>
+	<string name="poi_craft_upholsterer">실내</string>
+	<string name="poi_craft_watchmaker">시계공</string>
+	<string name="poi_craft_window_construction">창문 건설</string>
 
 	<string name="poi_funeral_directors">장례 감독</string>
-	<string name="poi_computer_craft">컴퓨터 기술</string>
-	<string name="poi_beauty_salon">뷰티 살롱</string>
+	<string name="poi_craft_computer">컴퓨터 기술</string>
+	<string name="poi_beauty">뷰티 살롱</string>
 	<string name="poi_beauty_salon_nails">네일 살롱</string>
 	<string name="poi_hairdresser">헤어 드레서</string>
 	<string name="poi_massage">마사지 살롱</string>
@@ -553,7 +553,7 @@
 	<string name="poi_pawnbroker">전당포</string>
 	<string name="poi_currencyexchange">변경소</string>
 	<string name="poi_accountant">회계사</string>
-	<string name="poi_bitcoin_yes">Bitcoin 지불</string>
+	<string name="poi_bitcoin">Bitcoin 지불</string>
 
 	<string name="poi_cave_entrance">동굴 입구</string>
 	<string name="poi_peak">봉우리</string>
@@ -631,7 +631,7 @@
 	<string name="poi_military_nuclear_explosion_site">핵 폭발 사이트</string>
 <string name="poi_amusement_ride">라이드 즐기기</string>
 	<string name="poi_attraction_animal">동물 (명소)</string>
-	<string name="poi_ferris_wheel">페리스 휠</string>
+	<string name="poi_big_wheel">페리스 휠</string>
 	<string name="poi_carousel">목마</string>
 	<string name="poi_maze">미로</string>
 	<string name="poi_roller_coaster">롤러 코스터</string>
@@ -665,11 +665,11 @@
 	<string name="poi_osmwiki">위키백과</string>
 	<string name="poi_user_defined_other">사용자 정의</string>
 	
-	<string name="poi_child_clothes_shop">어린이 의류</string>
+	<string name="poi_child_clothes">어린이 의류</string>
 	<string name="poi_apartment">아파트</string>
 
 	<string name="poi_military_landuse">군사 지역</string>
-	<string name="poi_general">일반 상점</string>
+	
 	<string name="poi_car">자동차 가게</string>
 	<string name="poi_car_parts">자동차 부품</string>
 	<string name="poi_public_transport_stop_position">대중 교통 정류장 위치</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 4dbc6a5af8..bb0ed46bcf 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -656,7 +656,7 @@
 	<string name="search_online_address">온라인 검색</string>
 	<string name="max_level_download_tile">최대 온라인 줌</string>
 	<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
-	<string name="route_general_information">전체거리 %1$s,\n 여행시간 %2$d h %3$d m.</string>
+	<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
 	<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
 	<string name="router_service">운행 서비스</string>
 	<string name="sd_dir_not_accessible">SD 카드에 있는 데이터 저장 폴더에 접근할 수 없습니다!</string>
@@ -1145,7 +1145,7 @@
     <string name="map_widget_distancemeasurement">거리 측정</string>
     
     <string name="map_widget_audionotes">소리 노트</string>
-    <string name="audionotes_plugin_description">이 플러그인은 여행하는 동안 소리/사진/영상을 찍기 위한 기능과 버튼을 제공합니다</string>
+    <string name="audionotes_plugin_description">이 플러그인은 여행하는 동안 소리/사진/영상을 찍기 위한 기능과 버튼을 제공합니다.</string>
     <string name="audionotes_plugin_name">소리/영상 노트</string>
     <string name="index_srtm_parts">부분</string>
     <string name="index_srtm_ele">등고선</string>
@@ -2200,4 +2200,10 @@
 	<string name="waypoint_visit_after">방문 후</string>
     <string name="waypoint_visit_before">방문 하기 전</string>
     <string name="shared_string_collapse">실패</string>
-	</resources>
+	<string name="action_create">액션 생성</string>
+	<string name="action_modify">액션 수정</string>
+	<string name="action_delete">액션 삭제</string>
+	<string name="osm_edits">OSM 편집</string>
+	<string name="osmand_parking_hour">시간</string><string name="osmand_parking_minute">분</string><string name="osmand_parking_time_left">남은 시간</string> <string name="parking_place_limited">주차 장소 시간 제한</string>
+	<string name="your_edits">편집</string>
+    </resources>
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index e0d027fe92..de892f307d 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -3,7 +3,7 @@
 	<string name="poi_attraction">Turistattraksjon</string>
 	<string name="poi_viewpoint">Utsiktspunkt</string>
 	<string name="poi_museum">Museum</string>
-	<string name="poi_tourism_information">Turistinformasjon</string>
+	<string name="poi_information">Turistinformasjon</string>
 	<string name="poi_hotel">Hotell</string>
 	<string name="poi_picnic_site">Rasteplass</string>
 	<string name="poi_camp_site">Campingplass</string>
@@ -16,12 +16,12 @@
 
 	<string name="poi_bakery">Bakeri</string>
 	<string name="poi_supermarket">Supermarked</string>
-	<string name="poi_bookshop">Bokhandel</string>
-	<string name="poi_bicycle_shop">Sykkelbutikk</string>
-	<string name="poi_art_shop">Kunsthandler</string>
+	<string name="poi_books">Bokhandel</string>
+	<string name="poi_bicycle">Sykkelbutikk</string>
+	<string name="poi_art">Kunsthandler</string>
 	<string name="poi_shoes">Skobutikk</string>
-	<string name="poi_musical_instrument_shop">Musikkinstrumenter</string>
-	<string name="poi_organic_shop">Økologisk mat</string>
+	<string name="poi_musical_instrument">Musikkinstrumenter</string>
+	<string name="poi_organic">Økologisk mat</string>
 	<string name="poi_second_hand">Bruktbutikk</string>
 	<string name="poi_marketplace">Markedsplass</string>
 	<string name="poi_police">Politi</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 9bf8914694..84a9e50bee 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="poi_mine_historic">Historische mijn</string>
+<resources><string name="poi_historic_mine">Historische mijn</string>
 	<string name="poi_palaeontological_site">Paleontologische site</string>
 
 	<string name="poi_bakery">Bakkerij</string>
@@ -20,79 +20,79 @@
 	<string name="poi_dairy">Zuivelwinkel</string>
 	<string name="poi_vending_machine">Verkoopautomaat</string>
 
-	<string name="poi_bookshop">Boekhandel</string>
-	<string name="poi_bicycle_shop">Fietswinkel</string>
-	<string name="poi_anime_shop">Animewinkel</string>
-	<string name="poi_antiques_shop">Antiekwinkel</string>
-	<string name="poi_art_shop">Galerie</string>
+	<string name="poi_books">Boekhandel</string>
+	<string name="poi_bicycle">Fietswinkel</string>
+	<string name="poi_anime">Animewinkel</string>
+	<string name="poi_antiques">Antiekwinkel</string>
+	<string name="poi_art">Galerie</string>
 	<string name="poi_baby_goods">Babywinkel</string>
-	<string name="poi_bag_shop">Lederwaren</string>
-	<string name="poi_bathroom_furnishing_shop">Sanitairwinkel</string>
-	<string name="poi_bed_shop">Beddenwinkel</string>
+	<string name="poi_bag">Lederwaren</string>
+	<string name="poi_bathroom_furnishing">Sanitairwinkel</string>
+	<string name="poi_bed">Beddenwinkel</string>
 	<string name="poi_boutique">Modezaak</string>
-	<string name="poi_carpet_shop">Tapijtwinkel</string>
-	<string name="poi_chemist_shop">Drogisterij</string>
-	<string name="poi_clothes_shop">Kledingwinkel</string>
-	<string name="poi_children_clothes_shop">Kinderkledingwinkel</string>
+	<string name="poi_carpet">Tapijtwinkel</string>
+	<string name="poi_chemist">Drogisterij</string>
+	<string name="poi_clothes">Kledingwinkel</string>
+	<string name="poi_children_clothes">Kinderkledingwinkel</string>
 	<string name="poi_shoes">Schoenenwinkel</string>
-	<string name="poi_computer_shop">Computerwinkel</string>
+	<string name="poi_computer">Computerwinkel</string>
 	<string name="poi_copyshop">Kopieerzaak</string>
-	<string name="poi_curtain_shop">Gordijnwinkel</string>
-	<string name="poi_fabric_shop">Stoffenwinkel</string>
-	<string name="poi_bedding_shop">Beddenwinkel</string>
-	<string name="poi_dive_shop">Duikbenodigdheden</string>
-	<string name="poi_doityourself_shop">Bouwmarkt</string>
-	<string name="poi_erotic_shop">Sex-shop</string>
+	<string name="poi_curtain">Gordijnwinkel</string>
+	<string name="poi_fabric">Stoffenwinkel</string>
+	<string name="poi_bedding">Beddenwinkel</string>
+	<string name="poi_dive">Duikbenodigdheden</string>
+	<string name="poi_doityourself">Bouwmarkt</string>
+	<string name="poi_erotic">Sex-shop</string>
 	<string name="poi_florist">Bloemenwinkel</string>
 	<string name="poi_garden_centre">Tuincentrum</string>
-	<string name="poi_gas_shop">Gasflessen</string>
-	<string name="poi_gift_shop">Cadeauwinkel</string>
-	<string name="poi_glaziery_shop">Glashandel</string>
-	<string name="poi_hardware_shop">IJzerhandel</string>
-	<string name="poi_hearing_aids_shop">Hoorapparaten</string>
-	<string name="poi_fishing_shop">Hengelsportzaak</string>
-	<string name="poi_frame_shop">Fotolijstwinkel</string>
-	<string name="poi_furniture_shop">Meubelwinkel</string>
-	<string name="poi_general_shop">Winkel in diverse goederen</string>
+	<string name="poi_gas">Gasflessen</string>
+	<string name="poi_gift">Cadeauwinkel</string>
+	<string name="poi_glaziery">Glashandel</string>
+	<string name="poi_hardware">IJzerhandel</string>
+	<string name="poi_hearing_aids">Hoorapparaten</string>
+	<string name="poi_fishing">Hengelsportzaak</string>
+	<string name="poi_frame">Fotolijstwinkel</string>
+	<string name="poi_furniture">Meubelwinkel</string>
+	<string name="poi_general">Winkel in diverse goederen</string>
 	<string name="poi_herbalist">Kruidenierszaak</string>
-	<string name="poi_hifi_shop">Hi-Fi-winkel</string>
-	<string name="poi_houseware_shop">Huishoudzaak</string>
-	<string name="poi_hunting_shop">Jachtwinkel</string>
-	<string name="poi_interior_decoration_shop">Interieurdecoratiewinkel</string>
-	<string name="poi_jewelry_shop">Juwelier</string>
+	<string name="poi_hifi">Hi-Fi-winkel</string>
+	<string name="poi_houseware">Huishoudzaak</string>
+	<string name="poi_hunting">Jachtwinkel</string>
+	<string name="poi_interior_decoration">Interieurdecoratiewinkel</string>
+	<string name="poi_jewelry">Juwelier</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Kookwinkel</string>
-	<string name="poi_mobile_phone_shop">Mobiele telefoon-winkel</string>
-	<string name="poi_motorcycle_shop">Motorwinkel</string>
-	<string name="poi_musical_instrument_shop">Muziekinstrumentenwinkel</string>
-	<string name="poi_newsagent_shop">Persagentschap</string>
+	<string name="poi_kitchen">Kookwinkel</string>
+	<string name="poi_mobile_phone">Mobiele telefoon-winkel</string>
+	<string name="poi_motorcycle">Motorwinkel</string>
+	<string name="poi_musical_instrument">Muziekinstrumentenwinkel</string>
+	<string name="poi_newsagent">Persagentschap</string>
 	<string name="poi_optician_shop">Opticien</string>
-	<string name="poi_organic_shop">Biologische voedingswinkel</string>
-	<string name="poi_outdoor_shop">Buitensportwinkel</string>
-	<string name="poi_paint_shop">Verfwinkel</string>
-	<string name="poi_pet_shop">Dierenwinkel</string>
-	<string name="poi_radiotechnics_shop">Radiotechnics-winkel</string>
+	<string name="poi_organic">Biologische voedingswinkel</string>
+	<string name="poi_outdoor">Buitensportwinkel</string>
+	<string name="poi_paint">Verfwinkel</string>
+	<string name="poi_pet">Dierenwinkel</string>
+	<string name="poi_radiotechnics">Radiotechnics-winkel</string>
 	<string name="poi_second_hand">Tweedehandswinkel</string>
 	<string name="poi_ship_chandler">Scheepsbevoorrader</string>
-	<string name="poi_sports_shop">Sportwinkel</string>
-	<string name="poi_stationery_shop">Briefpapierwinkel</string>
-	<string name="poi_tableware_shop">Servieswinkel</string>
-	<string name="poi_ticket_shop">Ticketwinkel</string>
-	<string name="poi_tobacco_shop">Tabakswinkel</string>
-	<string name="poi_toys_shop">Speelgoedwinkel</string>
-	<string name="poi_trade_shop">Handelspost</string>
-	<string name="poi_vacuum_cleaner_shop">Stofzuigerwinkel</string>
+	<string name="poi_sports">Sportwinkel</string>
+	<string name="poi_stationery">Briefpapierwinkel</string>
+	<string name="poi_tableware">Servieswinkel</string>
+	<string name="poi_ticket">Ticketwinkel</string>
+	<string name="poi_tobacco">Tabakswinkel</string>
+	<string name="poi_toys">Speelgoedwinkel</string>
+	<string name="poi_trade">Handelspost</string>
+	<string name="poi_vacuum_cleaner">Stofzuigerwinkel</string>
 	<string name="poi_variety_store">Variëteitenzaak</string>
-	<string name="poi_video_shop">Videotheek</string>
-	<string name="poi_window_blind_shop">Rolluikenwinkel</string>
+	<string name="poi_video">Videotheek</string>
+	<string name="poi_window_blind">Rolluikenwinkel</string>
 	<string name="poi_department_store">Warenhuis</string>
-	<string name="poi_electronics_shop">Elektronica-winkel</string>
+	<string name="poi_electronics">Elektronica-winkel</string>
 	<string name="poi_car_shop">Autohandelaar</string>
 	<string name="poi_car_parts_shop">Auto-onderdelenwinkel</string>
-	<string name="poi_atv_shop">Quad-winkel</string>
-	<string name="poi_cosmetics_shop">Cosmeticazaak</string>
+	<string name="poi_atv">Quad-winkel</string>
+	<string name="poi_cosmetics">Cosmeticazaak</string>
 	<string name="poi_marketplace">Marktplaats</string>
-	<string name="poi_sewing_shop">Confectiewinkel</string>
+	<string name="poi_sewing">Confectiewinkel</string>
 
 	<string name="poi_police">Politie</string>
 	<string name="poi_fire_station">Brandweer</string>
@@ -136,7 +136,7 @@
 	<string name="poi_railway_station">Treinstation (verouderd)</string>
 	<string name="poi_railway_platform">Perron (verouderd)</string>
 	<string name="poi_railway_halt">Treinhalte (verouderd)</string>
-	<string name="poi_subway_entrance">Metro-ingang</string>
+	<string name="poi_railway_subway_entrance">Metro-ingang</string>
 	<string name="poi_subway_station">Metrostation</string>
 	<string name="poi_taxi">Taxistandplaats</string>
 
@@ -213,8 +213,8 @@
 	<string name="poi_town_hall">Stadhuis</string>
 	<string name="poi_advertising_agency">Reclamebureau</string>
 	<string name="poi_educational_institution">Onderwijsinstelling</string>
-	<string name="poi_architect_office">Architectenkantoor</string>
-	<string name="poi_research_office">Onderzoekskantoor</string>
+	<string name="poi_architect">Architectenkantoor</string>
+	<string name="poi_research">Onderzoekskantoor</string>
 	<string name="poi_studio">Studio</string>
 	<string name="poi_bookmaker">Bookmaker</string>
 
@@ -228,15 +228,15 @@
 	<string name="poi_city_gate">Stadspoort</string>
 	<string name="poi_fort">Fort</string>
 	<string name="poi_fountain">Fontein</string>
-	<string name="poi_ruins_historic">Historische ruïnes</string>
-	<string name="poi_ship_historic">Historisch schip</string>
+	<string name="poi_historic_ruins">Historische ruïnes</string>
+	<string name="poi_historic_ship">Historisch schip</string>
 	<string name="poi_wreck">Scheepswrak</string>
 	<string name="poi_monument">Monument</string>
 	<string name="poi_zoo">Zoo</string>
 	<string name="poi_aquarium">Aquarium</string>
 	<string name="poi_attraction">Toeristische attractie</string>
 	<string name="poi_attraction_animal">Dier (attractie)</string>
-	<string name="poi_ferris_wheel">Reuzenrad</string>
+	<string name="poi_big_wheel">Reuzenrad</string>
 	<string name="poi_carousel">Draaimolen</string>
 	<string name="poi_maze">Doolhof</string>
 	<string name="poi_roller_coaster">Achtbaan</string>
@@ -258,15 +258,15 @@
 
 	<string name="poi_monastery">Klooster</string>
 	<string name="poi_historic_monastery">Historisch klooster</string>
-	<string name="poi_place_of_worship_taoist">Gebedshuis: taoïstisch</string>
+	<string name="poi_religion_taoist">Gebedshuis: taoïstisch</string>
 	<string name="poi_place_of_worship">Gebedshuis</string>
-	<string name="poi_place_of_worship_christian">Gebedshuis: christelijk</string>
-	<string name="poi_place_of_worship_jewish">Gebedshuis: joods</string>
-	<string name="poi_place_of_worship_muslim">Gebedshuis: islamitisch</string>
-	<string name="poi_place_of_worship_sikh">Gebedshuis: sikh</string>
-	<string name="poi_place_of_worship_buddhist">Gebedshuis: boeddhistisch</string>
-	<string name="poi_place_of_worship_hindu">Gebedshuis: hindu</string>
-	<string name="poi_place_of_worship_shinto">Gebedshuis: shinto</string>
+	<string name="poi_religion_christian">Gebedshuis: christelijk</string>
+	<string name="poi_religion_jewish">Gebedshuis: joods</string>
+	<string name="poi_religion_muslim">Gebedshuis: islamitisch</string>
+	<string name="poi_religion_sikh">Gebedshuis: sikh</string>
+	<string name="poi_religion_buddhist">Gebedshuis: boeddhistisch</string>
+	<string name="poi_religion_hindu">Gebedshuis: hindu</string>
+	<string name="poi_religion_shinto">Gebedshuis: shinto</string>
 	<string name="poi_clock">Klok</string>
 	<string name="poi_travel_agent">Reisbureau</string>
 	<string name="poi_spring">Bron</string>
@@ -316,7 +316,7 @@
 	<string name="poi_stripclub">Stripclub</string>
 	<string name="poi_beach_resort">Badplaats</string>
 	<string name="poi_dog_park">Hondenpark</string>
-	<string name="poi_fishing_place">Visplaats</string>
+	<string name="poi_leisure_fishing">Visplaats</string>
 	<string name="poi_hunting_stand">Jachttoren</string>
 	<string name="poi_harbour">Haven</string>
 	<string name="poi_marina">Jachthaven</string>
@@ -334,30 +334,30 @@
 	<string name="poi_pub">Kroeg</string>
 	<string name="poi_barbecue">Barbecue</string>
 
-	<string name="poi_blacksmith">Smid</string>
-	<string name="poi_beekeeper">Imker</string>
-	<string name="poi_basket_maker">Mandenvlechter</string>
-	<string name="poi_brewery">Brouwerij</string>
-	<string name="poi_boatbuilder">Botenbouwer</string>
-	<string name="poi_bookbinder">Boekbinder</string>
-	<string name="poi_carpenter">Timmerman</string>
-	<string name="poi_electrician">Elektricien</string>
-	<string name="poi_gardener">Tuinier</string>
-	<string name="poi_locksmith">Slotenmaker</string>
-	<string name="poi_jeweller">Juwelier</string>
-	<string name="poi_key_cutter">Slotenmaker</string>
-	<string name="poi_optician">Opticien</string>
-	<string name="poi_painter">Schilder</string>
-	<string name="poi_photographer">Fotograaf</string>
-	<string name="poi_photographic_laboratory">Fotografisch laboratorium</string>
-	<string name="poi_plumber">Loodgieter</string>
-	<string name="poi_plasterer">Stukadoor</string>
-	<string name="poi_rigger">Tuiger</string>
-	<string name="poi_roofer">Dakdekker</string>
-	<string name="poi_saddler">Zadelaar</string>
-	<string name="poi_shoemaker">Schoenmaker</string>
-	<string name="poi_tailor">Kleermaker</string>
-	<string name="poi_beauty_salon">Schoonheidssalon</string>
+	<string name="poi_craft_blacksmith">Smid</string>
+	<string name="poi_craft_beekeeper">Imker</string>
+	<string name="poi_craft_basket_maker">Mandenvlechter</string>
+	<string name="poi_craft_brewery">Brouwerij</string>
+	<string name="poi_craft_boatbuilder">Botenbouwer</string>
+	<string name="poi_craft_bookbinder">Boekbinder</string>
+	<string name="poi_craft_carpenter">Timmerman</string>
+	<string name="poi_craft_electrician">Elektricien</string>
+	<string name="poi_craft_gardener">Tuinier</string>
+	<string name="poi_craft_locksmith">Slotenmaker</string>
+	<string name="poi_craft_jeweller">Juwelier</string>
+	<string name="poi_craft_key_cutter">Slotenmaker</string>
+	<string name="poi_craft_optician">Opticien</string>
+	<string name="poi_craft_painter">Schilder</string>
+	<string name="poi_craft_photographer">Fotograaf</string>
+	<string name="poi_craft_photographic_laboratory">Fotografisch laboratorium</string>
+	<string name="poi_craft_plumber">Loodgieter</string>
+	<string name="poi_craft_plasterer">Stukadoor</string>
+	<string name="poi_craft_rigger">Tuiger</string>
+	<string name="poi_craft_roofer">Dakdekker</string>
+	<string name="poi_craft_saddler">Zadelaar</string>
+	<string name="poi_craft_shoemaker">Schoenmaker</string>
+	<string name="poi_craft_tailor">Kleermaker</string>
+	<string name="poi_beauty">Schoonheidssalon</string>
 	<string name="poi_beauty_salon_nails">Nagelsalon</string>
 	<string name="poi_hairdresser">Kapper</string>
 	<string name="poi_massage">Massagesalon</string>
@@ -491,14 +491,14 @@
 	<string name="poi_pension_fund">Pensioenfonds</string>
 	<string name="poi_migration">Migratie</string>
 	<string name="poi_tax_inspection">Belastingsinspectie</string>
-	<string name="poi_administrative_office">Administratief kantoor</string>
+	<string name="poi_office_administrative">Administratief kantoor</string>
 	<string name="poi_speech_therapist">Logopedist</string>
 	<string name="poi_healthcare_yes">Medische voorziening</string>
 
-	<string name="poi_telecommunication_office">Telecommunicatiekantoor</string>
+	<string name="poi_office_telecommunication">Telecommunicatiekantoor</string>
 	<string name="poi_employment_agency">Arbeidsbureau</string>
-	<string name="poi_it_office">IT-kantoor</string>
-	<string name="poi_newspaper_office">Krantenkantoor</string>
+	<string name="poi_it">IT-kantoor</string>
+	<string name="poi_newspaper">Krantenkantoor</string>
 	<string name="poi_pitch">Sportveld</string>
 	<string name="poi_leisure_track">Circuit</string>
 	<string name="poi_horse_track">Paardenrenbaan</string>
@@ -560,8 +560,7 @@
 	<string name="poi_farm">Boerderijwinkel</string>
 	<string name="poi_wine">Wijnhandel</string>
 
-	<string name="poi_child_clothes_shop">Kinderkleding</string>
-	<string name="poi_general">Supermarkt</string>
+	<string name="poi_child_clothes">Kinderkleding</string>
 	<string name="poi_car">Auto dealer</string>
 	<string name="poi_car_parts">Auto onderdelen</string>
 	<string name="poi_public_transport_stop_position">Halte openbaar vervoer</string>
@@ -592,41 +591,41 @@
 	
 	<string name="poi_wayside_cross">Wegkruis</string>
 	<string name="poi_wayside_shrine">Odsey schrijn</string>
-	<string name="poi_tourism_information">VVV</string>
+	<string name="poi_information">VVV</string>
 	<string name="poi_viewpoint">Uitzicht</string>
 	<string name="poi_camp_site">Kampeerplaats</string>
 	<string name="poi_caravan_site">Caravanterrein</string>
 	<string name="poi_picnic_site">Picknickplaats</string>
 	<string name="poi_food_court">Eetplein</string>
 	<string name="poi_drinking_water">Drinkwater</string>
-	<string name="poi_agricultural_engines_craft">Landbouwmachines</string>
-	<string name="poi_carpet_layer">Stoffeerder</string>
-	<string name="poi_caterer">Traiteur</string>
-	<string name="poi_clockmaker">Horlogemaker</string>
-	<string name="poi_dressmaker">Kleermaker</string>
-	<string name="poi_glaziery_craft">Glasblazer</string>
-	<string name="poi_handicraft">Hobby- en handwerk</string>
-	<string name="poi_hvac">Loodgieters en installatie bedrijf</string>
-	<string name="poi_insulation_craft">Isolatiebedrijf</string>
-	<string name="poi_metal_construction_craft">Metaalconstructiebedrijf</string>
-	<string name="poi_parquet_layer">Parketteur</string>
-	<string name="poi_pottery_craft">Pottenbakkerij</string>
-	<string name="poi_sailmaker">Zeilmaker</string>
-	<string name="poi_sawmill">Houtzagerij</string>
-	<string name="poi_scaffolder">Steigerbouwer</string>
-	<string name="poi_sculptor">Beeldhouwer</string>
-	<string name="poi_stand_builder">Standbouwer</string>
-	<string name="poi_stonemason">Steenhouwer</string>
-	<string name="poi_sun_protection_craft">Buitensportwinkel</string>
-	<string name="poi_sweep">Vegen</string>
-	<string name="poi_tiler">Tegelzetter</string>
-	<string name="poi_tinsmith">Tingieter</string>
-	<string name="poi_upholsterer">Stoffeerder</string>
-	<string name="poi_watchmaker">Horlogemaker</string>
-	<string name="poi_window_construction">Vensterbouw</string>
+	<string name="poi_craft_agricultural_engines">Landbouwmachines</string>
+	<string name="poi_craft_carpet_layer">Stoffeerder</string>
+	<string name="poi_craft_caterer">Traiteur</string>
+	<string name="poi_craft_clockmaker">Horlogemaker</string>
+	<string name="poi_craft_dressmaker">Kleermaker</string>
+	<string name="poi_craft_glaziery">Glasblazer</string>
+	<string name="poi_craft_handicraft">Hobby- en handwerk</string>
+	<string name="poi_craft_hvac">Loodgieters en installatie bedrijf</string>
+	<string name="poi_craft_insulation">Isolatiebedrijf</string>
+	<string name="poi_craft_metal_construction">Metaalconstructiebedrijf</string>
+	<string name="poi_craft_parquet_layer">Parketteur</string>
+	<string name="poi_craft_pottery">Pottenbakkerij</string>
+	<string name="poi_craft_sailmaker">Zeilmaker</string>
+	<string name="poi_craft_sawmill">Houtzagerij</string>
+	<string name="poi_craft_scaffolder">Steigerbouwer</string>
+	<string name="poi_craft_sculptor">Beeldhouwer</string>
+	<string name="poi_craft_stand_builder">Standbouwer</string>
+	<string name="poi_craft_stonemason">Steenhouwer</string>
+	<string name="poi_craft_sun_protection">Buitensportwinkel</string>
+	<string name="poi_craft_sweep">Vegen</string>
+	<string name="poi_craft_tiler">Tegelzetter</string>
+	<string name="poi_craft_tinsmith">Tingieter</string>
+	<string name="poi_craft_upholsterer">Stoffeerder</string>
+	<string name="poi_craft_watchmaker">Horlogemaker</string>
+	<string name="poi_craft_window_construction">Vensterbouw</string>
 
 	<string name="poi_funeral_directors">Begrafenisondernemers</string>
-	<string name="poi_computer_craft">Computerwinkel</string>
+	<string name="poi_craft_computer">Computerwinkel</string>
 	<string name="poi_dry_cleaning">Stomerij</string>
 	<string name="poi_laundry">Wasserette</string>
 	<string name="poi_car_sharing">Autodelen</string>
@@ -634,7 +633,7 @@
 	<string name="poi_money_lender">Kredietvertrekker</string>
 	<string name="poi_pawnbroker">Pandjesbaas</string>
 	<string name="poi_currencyexchange">Geldwisselkantoor</string>
-	<string name="poi_bitcoin_yes">Bitcoin betaling</string>
+	<string name="poi_bitcoin">Bitcoin betaling</string>
 
 	<string name="poi_stone">Natuursteen</string>
 	<string name="poi_cape">Kaap</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 07cbf358d4..61266cb4fb 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -18,79 +18,79 @@
 	<string name="poi_dairy">Sklep z nabiałem</string>
 	<string name="poi_vending_machine">Automat sprzedający</string>
 
-	<string name="poi_bookshop">Księgarnia</string>
-	<string name="poi_bicycle_shop">Sklep rowerowy</string>
-	<string name="poi_antiques_shop">Sklep z antykami</string>
-	<string name="poi_anime_shop">Sklep z anime</string>
-	<string name="poi_art_shop">Sklep ze sztuką</string>
+	<string name="poi_books">Księgarnia</string>
+	<string name="poi_bicycle">Sklep rowerowy</string>
+	<string name="poi_antiques">Sklep z antykami</string>
+	<string name="poi_anime">Sklep z anime</string>
+	<string name="poi_art">Sklep ze sztuką</string>
 	<string name="poi_baby_goods">Towary dziecięce</string>
-	<string name="poi_bag_shop">Sklep z torbami</string>
-	<string name="poi_bathroom_furnishing_shop">Wyposażenie łazienek</string>
-	<string name="poi_bed_shop">Wyposażenie pokoji</string>
+	<string name="poi_bag">Sklep z torbami</string>
+	<string name="poi_bathroom_furnishing">Wyposażenie łazienek</string>
+	<string name="poi_bed">Wyposażenie pokoji</string>
 	<string name="poi_boutique">Butik</string>
-	<string name="poi_carpet_shop">Sklep z dywanami</string>
-	<string name="poi_chemist_shop">Sklep z narkotykami</string>
-	<string name="poi_clothes_shop">Sklep odzieżowy</string>
-	<string name="poi_children_clothes_shop">Sklep odzieżowy dla dzieci</string>
+	<string name="poi_carpet">Sklep z dywanami</string>
+	<string name="poi_chemist">Sklep z narkotykami</string>
+	<string name="poi_clothes">Sklep odzieżowy</string>
+	<string name="poi_children_clothes">Sklep odzieżowy dla dzieci</string>
 	<string name="poi_shoes">Sklep obuwniczy</string>
-	<string name="poi_computer_shop">Sklep komputerowy</string>
-	<string name="poi_curtain_shop">Sklep z zasłonami</string>
-	<string name="poi_fabric_shop">Sklep z firankami</string>
-	<string name="poi_bedding_shop">Sklep z pościelą</string>
-	<string name="poi_dive_shop">Sprzęt do nurkowania</string>
+	<string name="poi_computer">Sklep komputerowy</string>
+	<string name="poi_curtain">Sklep z zasłonami</string>
+	<string name="poi_fabric">Sklep z firankami</string>
+	<string name="poi_bedding">Sklep z pościelą</string>
+	<string name="poi_dive">Sprzęt do nurkowania</string>
 	<string name="poi_copyshop">Punkt ksero i drukowania</string>
-	<string name="poi_doityourself_shop">Sklep dla majsterkowiczów</string>
-	<string name="poi_erotic_shop">Sexshop</string>
-	<string name="poi_fishing_shop">Sklep wędkarski</string>
+	<string name="poi_doityourself">Sklep dla majsterkowiczów</string>
+	<string name="poi_erotic">Sexshop</string>
+	<string name="poi_fishing">Sklep wędkarski</string>
 	<string name="poi_florist">Kwiaciarnia</string>
-	<string name="poi_frame_shop">Ramy obrazowe</string>
-	<string name="poi_furniture_shop">Sklep meblowy</string>
+	<string name="poi_frame">Ramy obrazowe</string>
+	<string name="poi_furniture">Sklep meblowy</string>
 	<string name="poi_garden_centre">Centrum ogrodnicze</string>
-	<string name="poi_gas_shop">Magazyn gazu płynnego</string>
-	<string name="poi_general_shop">Magazyn</string>
-	<string name="poi_gift_shop">Sklep pamiątkarski</string>
-	<string name="poi_glaziery_shop">Szklarz</string>
-	<string name="poi_hardware_shop">Sklep z narzędziami</string>
-	<string name="poi_hearing_aids_shop">Aparaty słuchowe</string>
+	<string name="poi_gas">Magazyn gazu płynnego</string>
+	<string name="poi_general">Magazyn</string>
+	<string name="poi_gift">Sklep pamiątkarski</string>
+	<string name="poi_glaziery">Szklarz</string>
+	<string name="poi_hardware">Sklep z narzędziami</string>
+	<string name="poi_hearing_aids">Aparaty słuchowe</string>
 	<string name="poi_herbalist">Sklep zielarski</string>
-	<string name="poi_hifi_shop">Sklep ze sprzętem hifi</string>
-	<string name="poi_houseware_shop">Sklep z AGD</string>
-	<string name="poi_hunting_shop">Sprzęt do polowań</string>
-	<string name="poi_interior_decoration_shop">Dekoracja wnętrz</string>
-	<string name="poi_jewelry_shop">Jubiler</string>
+	<string name="poi_hifi">Sklep ze sprzętem hifi</string>
+	<string name="poi_houseware">Sklep z AGD</string>
+	<string name="poi_hunting">Sprzęt do polowań</string>
+	<string name="poi_interior_decoration">Dekoracja wnętrz</string>
+	<string name="poi_jewelry">Jubiler</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Art. kuchenne</string>
-	<string name="poi_mobile_phone_shop">Telefony komórkowe</string>
-	<string name="poi_motorcycle_shop">Motocykle</string>
-	<string name="poi_musical_instrument_shop">Instrumenty muzyczne</string>
-	<string name="poi_newsagent_shop">Kiosk gazetowy</string>
+	<string name="poi_kitchen">Art. kuchenne</string>
+	<string name="poi_mobile_phone">Telefony komórkowe</string>
+	<string name="poi_motorcycle">Motocykle</string>
+	<string name="poi_musical_instrument">Instrumenty muzyczne</string>
+	<string name="poi_newsagent">Kiosk gazetowy</string>
 	<string name="poi_optician_shop">Optyk</string>
-	<string name="poi_organic_shop">Żywność ekologiczna</string>
-	<string name="poi_outdoor_shop">Art. wyposażenia zewnętrznego</string>
-	<string name="poi_paint_shop">Farby</string>
-	<string name="poi_pet_shop">Zoologiczny</string>
-	<string name="poi_radiotechnics_shop">Art. RTV</string>
+	<string name="poi_organic">Żywność ekologiczna</string>
+	<string name="poi_outdoor">Art. wyposażenia zewnętrznego</string>
+	<string name="poi_paint">Farby</string>
+	<string name="poi_pet">Zoologiczny</string>
+	<string name="poi_radiotechnics">Art. RTV</string>
 	<string name="poi_second_hand">Rzeczy \"z drugiej ręki\"</string>
 	<string name="poi_ship_chandler">Armator</string>
-	<string name="poi_sports_shop">Sportowy</string>
-	<string name="poi_stationery_shop">Papierniczy</string>
-	<string name="poi_tableware_shop">Zastawy stołowe</string>
-	<string name="poi_ticket_shop">Bilety</string>
-	<string name="poi_tobacco_shop">Papierosy</string>
-	<string name="poi_toys_shop">Zabawki</string>
-	<string name="poi_trade_shop">Sklep wielobranżowy</string>
-	<string name="poi_vacuum_cleaner_shop">Odkurzacze</string>
+	<string name="poi_sports">Sportowy</string>
+	<string name="poi_stationery">Papierniczy</string>
+	<string name="poi_tableware">Zastawy stołowe</string>
+	<string name="poi_ticket">Bilety</string>
+	<string name="poi_tobacco">Papierosy</string>
+	<string name="poi_toys">Zabawki</string>
+	<string name="poi_trade">Sklep wielobranżowy</string>
+	<string name="poi_vacuum_cleaner">Odkurzacze</string>
 	<string name="poi_variety_store">Sklep wielobranżowy</string>
-	<string name="poi_video_shop">Filmy</string>
-	<string name="poi_window_blind_shop">Zasłony</string>
+	<string name="poi_video">Filmy</string>
+	<string name="poi_window_blind">Zasłony</string>
 	<string name="poi_department_store">Dom handlowy</string>
-	<string name="poi_electronics_shop">RTV</string>
+	<string name="poi_electronics">RTV</string>
 	<string name="poi_car_shop">Motoryzacyjny</string>
 	<string name="poi_car_parts_shop">Części samochodowe</string>
-	<string name="poi_atv_shop">Quady</string>
-	<string name="poi_cosmetics_shop">Kosmetyki</string>
+	<string name="poi_atv">Quady</string>
+	<string name="poi_cosmetics">Kosmetyki</string>
 	<string name="poi_marketplace">Bazar</string>
-	<string name="poi_sewing_shop">Pasmanteria</string>
+	<string name="poi_sewing">Pasmanteria</string>
 
 	<string name="poi_police">Policja</string>
 	<string name="poi_fire_station">Straż pożarna</string>
@@ -135,14 +135,14 @@
 	<string name="poi_public_transport_platform">Przystanek transportu miejskiego</string>
 	<string name="poi_public_transport_platform_bus">Przystanek autobusowy</string>
 	<string name="poi_public_transport_platform_trolleybus">Przystanek trolejbusowy</string>
-	<string name="poi_bus_stop">Przystanek autobusowy (przestarzałe)</string>
+	<string name="poi_bus_stop">Przystanek autobusowy</string>
 	<string name="poi_public_transport_platform_tram">Przystanek tramwajowy</string>
-	<string name="poi_tram_stop">Przystanek tramwajowy (przestarzałe)</string>
+	<string name="poi_tram_stop">Przystanek tramwajowy</string>
 	<string name="poi_public_transport_station">Dworzec transportu miejskiego</string>
-	<string name="poi_bus_station">Dworzec autobusowy (przestarzałe)</string>
-	<string name="poi_railway_station">Stacja kolejowa (przestarzałe)</string>
-	<string name="poi_railway_platform">Peron kolejowy (przestarzałe)</string>
-	<string name="poi_subway_entrance">Metro - wejście</string>
+	<string name="poi_bus_station">Dworzec autobusowy</string>
+	<string name="poi_railway_station">Stacja kolejowa</string>
+	<string name="poi_railway_platform">Peron kolejowy</string>
+	<string name="poi_railway_subway_entrance">Metro - wejście</string>
 	<string name="poi_subway_station">Stacja metra</string>
 	<string name="poi_taxi">Postój TAXI</string>
 
@@ -198,7 +198,7 @@
 	<string name="poi_telephone">Telefon</string>
 	<string name="poi_waste_basket">Kosz na śmieci</string>
 
-	<string name="poi_mine_historic">Zabytkowa kopalnia</string>
+	<string name="poi_historic_mine">Zabytkowa kopalnia</string>
 	<string name="poi_waterway_turning_point">Żeglugowy punkt zwrotny</string>
 	<string name="poi_weir">Grobla</string>
 	<string name="poi_power_plant">Elektrownia</string>
@@ -241,7 +241,7 @@
 	<string name="poi_prosecutor">Prokurator</string>
 	<string name="poi_pension_fund">Fundusz emerytalny</string>
 	<string name="poi_tax_inspection">Urząd podatkowy</string>
-	<string name="poi_administrative_office">Urząd</string>
+	<string name="poi_office_administrative">Urząd</string>
 	<string name="poi_customs">Urząd celny</string>
 	<string name="poi_city">Miasto</string>
 	<string name="poi_town">Miasto</string>
@@ -325,17 +325,17 @@
 	<string name="poi_city_gate">Brama miasta</string>
 	<string name="poi_fort">Fort</string>
 	<string name="poi_fountain">Fontanna</string>
-	<string name="poi_ruins_historic">Zabytkowe ruiny</string>
+	<string name="poi_historic_ruins">Zabytkowe ruiny</string>
 	<string name="poi_rune_stone">Kamień runiczny</string>
 	<string name="poi_wreck">Wrak statku</string>
-	<string name="poi_ship_historic">Zabytkowy statek</string>
+	<string name="poi_historic_ship">Zabytkowy statek</string>
 	<string name="poi_monument">Monument</string>
 	<string name="poi_zoo">Zoo</string>
 	<string name="poi_aquarium">Akwarium</string>
 	<string name="poi_theme_park">Park rozrywki</string>
 	
 	<string name="poi_attraction">Atrakcja turystyczna</string>
-	<string name="poi_ferris_wheel">Diabelski młyn</string>
+	<string name="poi_big_wheel">Diabelski młyn</string>
 	<string name="poi_carousel">Karuzela</string>
 	<string name="poi_maze">Labirynt</string>
 	<string name="poi_roller_coaster">Roller coaster</string>
@@ -350,7 +350,7 @@
 	<string name="poi_historic_monastery">Zabytkowy klasztor</string>
 	<string name="poi_wayside_cross">Przydrożny krzyż</string>
 	<string name="poi_wayside_shrine">Przydrożna kapliczka</string>
-	<string name="poi_tourism_information">Informacja turystyczna</string>
+	<string name="poi_information">Informacja turystyczna</string>
 	<string name="poi_clock">Zegar</string>
 	<string name="poi_geyser">Gejzer</string>
 	<string name="poi_cemetery">Cmentarz</string>
@@ -363,7 +363,7 @@
 	<string name="poi_circus">Cyrk</string>
 	<string name="poi_dance_floor">Parkiet taneczny</string>
 	<string name="poi_nightclub">Klub nocny</string>
-	<string name="poi_fishing_place">Miejsce połowów</string>
+	<string name="poi_leisure_fishing">Miejsce połowów</string>
 	<string name="poi_harbour">Port</string>
 	<string name="poi_miniature_golf">Miniaturowy golf</string>
 	<string name="poi_playground">Plac zabaw</string>
@@ -377,37 +377,37 @@
 	<string name="poi_drinking_water">Woda pitna</string>
 	<string name="poi_barbecue">Grill</string>
 
-	<string name="poi_basket_maker">Wikliniarz</string>
-	<string name="poi_beekeeper">Pszczelarz</string>
-	<string name="poi_blacksmith">Kowal</string>
-	<string name="poi_brewery">Browar</string>
-	<string name="poi_bookbinder">Introligator</string>
-	<string name="poi_carpenter">Cieśla</string>
-	<string name="poi_clockmaker">Zegarmistrz</string>
-	<string name="poi_dressmaker">Krawiec</string>
-	<string name="poi_electrician">Elektryk</string>
-	<string name="poi_gardener">Ogrodnik</string>
-	<string name="poi_hvac">Ogrzewanie, wentylacja, klimatyzacja</string>
-	<string name="poi_locksmith">Ślusarz</string>
-	<string name="poi_optician">Optyk</string>
-	<string name="poi_painter">Malarz</string>
-	<string name="poi_photographer">Fotograf</string>
-	<string name="poi_photographic_laboratory">Laboratorium fotograficzne</string>
-	<string name="poi_plasterer">Tynkarz</string>
-	<string name="poi_plumber">Hydraulik</string>
-	<string name="poi_roofer">Dekarz</string>
-	<string name="poi_saddler">Rymarz</string>
-	<string name="poi_sawmill">Tartak</string>
-	<string name="poi_scaffolder">Monter rusztowań</string>
-	<string name="poi_sculptor">Rzeźbiarz</string>
-	<string name="poi_shoemaker">Szewc</string>
-	<string name="poi_stonemason">Kamieniarz</string>
-	<string name="poi_tailor">Krawiec</string>
-	<string name="poi_tiler">Glazurnik</string>
-	<string name="poi_tinsmith">Blacharz</string>
-	<string name="poi_upholsterer">Tapicer</string>
-	<string name="poi_watchmaker">Zegarmistrz</string>
-	<string name="poi_beauty_salon">Salon piękności</string>
+	<string name="poi_craft_basket_maker">Wikliniarz</string>
+	<string name="poi_craft_beekeeper">Pszczelarz</string>
+	<string name="poi_craft_blacksmith">Kowal</string>
+	<string name="poi_craft_brewery">Browar</string>
+	<string name="poi_craft_bookbinder">Introligator</string>
+	<string name="poi_craft_carpenter">Cieśla</string>
+	<string name="poi_craft_clockmaker">Zegarmistrz</string>
+	<string name="poi_craft_dressmaker">Krawiec</string>
+	<string name="poi_craft_electrician">Elektryk</string>
+	<string name="poi_craft_gardener">Ogrodnik</string>
+	<string name="poi_craft_hvac">Ogrzewanie, wentylacja, klimatyzacja</string>
+	<string name="poi_craft_locksmith">Ślusarz</string>
+	<string name="poi_craft_optician">Optyk</string>
+	<string name="poi_craft_painter">Malarz</string>
+	<string name="poi_craft_photographer">Fotograf</string>
+	<string name="poi_craft_photographic_laboratory">Laboratorium fotograficzne</string>
+	<string name="poi_craft_plasterer">Tynkarz</string>
+	<string name="poi_craft_plumber">Hydraulik</string>
+	<string name="poi_craft_roofer">Dekarz</string>
+	<string name="poi_craft_saddler">Rymarz</string>
+	<string name="poi_craft_sawmill">Tartak</string>
+	<string name="poi_craft_scaffolder">Monter rusztowań</string>
+	<string name="poi_craft_sculptor">Rzeźbiarz</string>
+	<string name="poi_craft_shoemaker">Szewc</string>
+	<string name="poi_craft_stonemason">Kamieniarz</string>
+	<string name="poi_craft_tailor">Krawiec</string>
+	<string name="poi_craft_tiler">Glazurnik</string>
+	<string name="poi_craft_tinsmith">Blacharz</string>
+	<string name="poi_craft_upholsterer">Tapicer</string>
+	<string name="poi_craft_watchmaker">Zegarmistrz</string>
+	<string name="poi_beauty">Salon piękności</string>
 	<string name="poi_beauty_salon_nails">Salon paznokci</string>
 	<string name="poi_hairdresser">Salon fryzjerski</string>
 	<string name="poi_massage">Salon masażu</string>
@@ -427,7 +427,7 @@
 	<string name="poi_atm">Bankomat</string>
 	<string name="poi_currencyexchange">Kantor</string>
 	<string name="poi_accountant">Księgowy</string>
-	<string name="poi_bitcoin_yes">Płatność bitcoinami</string>
+	<string name="poi_bitcoin">Płatność bitcoinami</string>
 
 	<string name="poi_peak">Szczyt</string>
 	<string name="poi_volcano">Wulkan</string>
@@ -450,9 +450,40 @@
 	<string name="poi_seamark_floating_dock">Dok pływający</string>
 	<string name="poi_seamark_harbour">Port</string>
 	<string name="poi_seamark_landmark">Punkt orientacyjny</string>
-	<string name="poi_military">Strefa wojskowa</string>
+	<string name="poi_military">Wojsko</string>
 	<string name="poi_military_airfield">Lotnisko wojskowe</string>
 	<string name="poi_military_bunker">Bunkier wojskowy</string>
 	<string name="poi_military_barracks">Koszary</string>
 	<string name="poi_military_range">Poligon</string>
+	<string name="poi_shop">Sklep</string>
+	<string name="poi_transportation">Transport</string>
+	<string name="poi_man_made">Przemysł</string>
+	<string name="poi_education">Edukacja</string>
+	<string name="poi_administrative">Administracyjne</string>
+	<string name="poi_healthcare">Opieka zdrowotna</string>
+	<string name="poi_sport">Sport</string>
+	<string name="poi_tourism">Turystyka</string>
+	<string name="poi_entertainment">Wypoczynek</string>
+	<string name="poi_sustenance">Jedzenie</string>
+	<string name="poi_finance">Finanse</string>
+	<string name="poi_natural">Natura</string>
+	<string name="poi_osmwiki">Wikipedia</string>
+	<string name="poi_user_defined_other">Zdefiniowane przez użytkownika</string>
+	
+	<string name="poi_wine">Sklep z winami</string>
+
+	<string name="poi_child_clothes">Odzież dla dzieci</string>
+	<string name="poi_car_parts">Części samochodowe</string>
+	<string name="poi_recycling">Recykling</string>
+	<string name="poi_pharmacy">Apteka</string>
+	<string name="poi_first_aid">Pierwsza pomoc</string>
+	<string name="poi_midwife">Położna</string>
+	<string name="poi_occupational_therapist">Terapeuta zajęciowy</string>
+	<string name="poi_healthcare_rehabilitation">Rehabilitacja</string>
+	<string name="poi_office_telecommunication">Urząd telekomunikacji</string>
+	<string name="poi_research">Biuro badań</string>
+	<string name="poi_newspaper">Redakcja gazety</string>
+	<string name="poi_bmx_sport">BMX</string>
+	<string name="poi_boules">Bule</string>
+	<string name="poi_battlefield">Miejsce bitwy</string>
 	</resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 4da18af42d..6a4a27c29b 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
   
   <string name="use_transparent_map_theme">Przezroczysty styl</string>
   <string name="native_library_not_supported">Biblioteka renderowania natywnego nie jest obsługiwana na tym urządzeniu.</string>
@@ -461,7 +462,7 @@
   <string name="searching">Szukanie…</string>
   <string name="searching_address">Szukanie adresu…</string>
   <string name="search_osm_nominatim">Wyszukaj w trybie online używając OSM Nominatim</string>
-  <string name="hint_search_online">Numer domu, ulica, miejscowość</string>
+  <string name="hint_search_online">Wyszukiwanie online: Numer domu, ulica, miejscowość</string>
   <string name="search_offline_address">Wyszukiwanie offline</string>
   <string name="search_online_address">Wyszukiwanie online</string>
   <string name="max_level_download_tile">Maks. zoom online</string>
@@ -851,7 +852,7 @@
   <string name="create_poi_link_to_osm_doc">
 <u>Online OSM</u> map classification with images"</string>
   <string name="local_index_routing_data">Dane trasowania</string>
-  <string name="navigate_point_format">Format:</string>
+  <string name="navigate_point_format">Format</string>
   <string name="poi_search_desc">Wyszukiwanie POI</string>
   <string name="address_search_desc">Wyszukiwanie adresu</string>
   <string name="navpoint_search_desc">Współrzędne</string>
@@ -899,8 +900,8 @@
   <string name="osmand_parking_pm">PM</string>
   <string name="osmand_parking_am">AM</string>
   <string name="osmand_parking_position_name">Miejsce parkowania</string>
-  <string name="osmand_parking_plugin_description">Wtyczka ta pozwala zapisać lokalizację zaparkowanego samochodu.</string>
-  <string name="osmand_parking_plugin_name">Wtyczka miejsca parkowania</string>
+  <string name="osmand_parking_plugin_description">Ta wtyczka pomaga łatwo zapamiętać miejsce parkowania samochodu za pomocą OsmAnd.</string>
+  <string name="osmand_parking_plugin_name">Miejsce parkowania</string>
   <string name="context_menu_item_add_parking_point">Oznacz jako pozycja parkowania</string>
   <string name="context_menu_item_delete_parking_point">Usuń znacznik parkowania</string>
   <string name="starting_point_too_far">Punkt początkowy jest zbyt daleko od najbliższej drogi.</string>
@@ -1237,7 +1238,7 @@
     <string name="use_kalman_filter_compass">Użyj filtru Kalmana</string>
     <string name="access_mark_final_location_first">Tryb ułatwień dostępu: wybierz najpierw punkt docelowy</string> 
     <string name="wait_current_task_finished">Zaczekaj aż bieżące zadanie zostanie zakończone</string>
-    <string name="shared_string_downloading">Pobieranie…</string>
+    <string name="shared_string_downloading">Pobieranie</string>
 	<string name="plugin_distance_point_time">czas</string>
     <string name="plugin_distance_point_hdop">precyzja</string>
     <string name="plugin_distance_point_speed">prędkość</string>
@@ -1573,8 +1574,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="routing_attr_weight_description">Określ ograniczenie masy pojazdu dozwolone na drodze</string>
     <string name="select_gpx">Wybierz GPX…</string>
     <string name="route_descr_select_destination">Wybierz cel podróży</string>
-    <string name="shared_string_select_on_map">Wybierz na mapie…</string>
-    <string name="shared_string_favorite">Ulubione…</string>
+    <string name="shared_string_select_on_map">Wybierz na mapie</string>
+    <string name="shared_string_favorite">Ulubione</string>
     <string name="route_preferences">Ustawienia trasy</string>
     <string name="route_info">Informacje o trasie</string>
     <string name="calculate_osmand_route_gpx">Przelicz trasę offline w OsmAnd</string>
@@ -1656,8 +1657,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 <string name="osmo_settings_uuid">Unikatowy identyfikator urządzenia</string>
     <string name="osmo_settings_descr">Skonfiguruj monitorowanie i ustaw osobisty kanał monitorowania</string>
     <string name="osmo_plugin_description">"OpenStreetMap zaawansowany monitoring na żywo, zobacz http://osmo.mobi. Daje możliwość śledzenia innych urządzeń i vice versa. Twórz anonimowe grupy, dziel się lokalizacją i prowadź komunikację. System ma wiele ustawień dla śledzenia w sesji lub stałego śledzenia. Grupy anonimowe mają ograniczenia czasowe i funkcjonalne, np. nie ma zdalnej kontroli i administratora grupy. W pełni funkcjonalne grupy powinny być tworzone przez witrynę, a dostęp zarezerwowany tylko dla zarejestrowanych użytkowników. "</string>
-    <string name="osmo_plugin_name">OsMo (Zaawansowany Monitoring na Żywo)</string>
-    <string name="osmo_settings">Monitoring OpenStreetMap</string>
+    <string name="osmo_plugin_name">Monitoring OsMo</string>
+    <string name="osmo_settings">Monitoring OsMo</string>
    	<string name="keep_informing_never">Tylko ręcznie (naciśnij strzałkę)</string>
     <string name="keep_informing_descr">Podawaj instrukcje nawigacji w regularnych odstępach czasu</string>
     <string name="keep_informing">Powtarzaj instrukcje nawigacji</string>
@@ -1877,7 +1878,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     
     
 <string name="rendering_attr_publicTransportMode_name">Trasy autobusowe, trolejbusowe, transportowe</string>
-	<string name="record_plugin_name">Nagrywaj swoje wycieczki</string>
+	<string name="record_plugin_name">Nagrywanie wycieczki</string>
     <string name="int_hour">godz.</string>
     <string name="duration">Czas trwania</string>
     <string name="distance">Odległość</string>
@@ -1963,7 +1964,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="dash_download_manage">Zarządzaj</string>
     <string name="map_locale">Język mapy</string>
     <string name="navigate_point_zone">Strefa</string>
-    <string name="download_tab_downloads">Pobrane</string>
+    <string name="download_tab_downloads">Pliki do pobrania</string>
     <string name="download_tab_updates">Aktualizacje</string>
     <string name="rendering_attr_roadStyle_name">Styl rysowania drogi</string>
     <string name="rendering_value_default_name">Domyślnie</string>
@@ -1994,4 +1995,23 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="osm_editing_manage">Zarządzaj</string>
     <string name="shared_string_disabled">Włącz</string>
 	<string name="shared_string_enabled">Wyłącz</string>
-</resources>
\ No newline at end of file
+<string name="plugin_nautical_name">Widok morski</string>
+	<string name="plugin_ski_name">Widok narciarski</string>
+	<string name="rename_failed">Zmiana nazwy nie powiodła się.</string>
+	<string name="back_to_map">Powrót do mapy</string>
+	<string name="share_note">Udostępnij uwagę</string>
+    <string name="location_on_map">Lokalizacja:\n Szer. %1$s\n Dł. %2$s</string>
+	<string name="notes">Uwagi</string>
+	<string name="online_map">Mapa online</string>
+	<string name="roads_only">Tylko drogi</string>
+    <string name="free">"Wolne %1$s "</string>
+	<string name="device_memory">Pamięć urządzenia</string>
+    <string name="edit_group">Edytuj grupę</string>
+    <string name="parking_place">Miejsce parkowania</string>
+    <string name="avoid_roads_msg">Możesz wywołać alternatywną trasę poprzez wybranie dróg, które mają być pomijane</string>
+	<string name="enable_proxy_title">Włącz proxy HTTP</string>
+	<string name="proxy_host_title">Host proxy</string>
+	<string name="proxy_port_title">Port proxy</string>
+	<string name="plugin_description_title">Opis</string>
+	<string name="plugin_install_needs_network">Do zainstalowania tej wtyczki potrzebujesz połączenia internetowego.</string>
+	</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 7c2dfabb71..2f64736410 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources>
+<resources> 
 	<string name="poi_bakery">Булочная</string>
 	<string name="poi_alcohol">Винно-водочный магазин</string>
 	<string name="poi_convenience">Магазин</string>
@@ -17,80 +17,80 @@
 	<string name="poi_dairy">Молочный магазин</string>
 	<string name="poi_vending_machine">Торговый автомат</string>
 
-	<string name="poi_bookshop">Книжный магазин</string>
-	<string name="poi_bicycle_shop">Магазин велосипедов</string>
-	<string name="poi_anime_shop">Магазин аниме</string>
-	<string name="poi_antiques_shop">Антиквариат</string>
-	<string name="poi_art_shop">Предметы искусства</string>
+	<string name="poi_books">Книжный магазин</string>
+	<string name="poi_bicycle">Магазин велосипедов</string>
+	<string name="poi_anime">Магазин аниме</string>
+	<string name="poi_antiques">Антиквариат</string>
+	<string name="poi_art">Предметы искусства</string>
 	<string name="poi_baby_goods">Товары для детей</string>
-	<string name="poi_bag_shop">Сумки, чемоданы</string>
-	<string name="poi_bathroom_furnishing_shop">Сантехника, ванные</string>
-	<string name="poi_bed_shop">Спальные принадлежности</string>
+	<string name="poi_bag">Сумки, чемоданы</string>
+	<string name="poi_bathroom_furnishing">Сантехника, ванные</string>
+	<string name="poi_bed">Спальные принадлежности</string>
 	<string name="poi_boutique">Бутик</string>
-	<string name="poi_carpet_shop">Магазин ковров</string>
+	<string name="poi_carpet">Магазин ковров</string>
 	<string name="poi_charity_shop">Благотворительный магазин</string>
-	<string name="poi_chemist_shop">Бытовая химия, косметика</string>
-	<string name="poi_clothes_shop">Одежда</string>
-	<string name="poi_children_clothes_shop">Детская одежда</string>
+	<string name="poi_chemist">Бытовая химия, косметика</string>
+	<string name="poi_clothes">Одежда</string>
+	<string name="poi_children_clothes">Детская одежда</string>
 	<string name="poi_shoes">Обувь</string>
-	<string name="poi_computer_shop">Компьютеры</string>
+	<string name="poi_computer">Компьютеры</string>
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
-	<string name="poi_curtain_shop">Шторы, портьеры</string>
-	<string name="poi_fabric_shop">Ткани</string>
-	<string name="poi_bedding_shop">Постельное бельё</string>
-	<string name="poi_dive_shop">Снаряжение для дайвинга</string>
-	<string name="poi_doityourself_shop">Инструменты и стройматериалы</string>
-	<string name="poi_erotic_shop">Секс-шоп</string>
-	<string name="poi_fishing_shop">Рыболовный магазин</string>
+	<string name="poi_curtain">Шторы, портьеры</string>
+	<string name="poi_fabric">Ткани</string>
+	<string name="poi_bedding">Постельное бельё</string>
+	<string name="poi_dive">Снаряжение для дайвинга</string>
+	<string name="poi_doityourself">Инструменты и стройматериалы</string>
+	<string name="poi_erotic">Секс-шоп</string>
+	<string name="poi_fishing">Рыболовный магазин</string>
 	<string name="poi_florist">Цветочный магазин</string>
-	<string name="poi_frame_shop">Рамки, багет</string>
-	<string name="poi_furniture_shop">Мебель</string>
+	<string name="poi_frame">Рамки, багет</string>
+	<string name="poi_furniture">Мебель</string>
 	<string name="poi_garden_centre">Садово-огородный магазин</string>
-	<string name="poi_gas_shop">Газ в баллонах</string>
-	<string name="poi_general_shop">Магазин</string>
-	<string name="poi_gift_shop">Подарки, сувениры</string>
-	<string name="poi_glaziery_shop">Окна, стёкла</string>
-	<string name="poi_hardware_shop">Скобяные изделия и инструмент</string>
-	<string name="poi_hearing_aids_shop">Слуховые аппараты</string>
+	<string name="poi_gas">Газ в баллонах</string>
+	<string name="poi_general">Магазин</string>
+	<string name="poi_gift">Подарки, сувениры</string>
+	<string name="poi_glaziery">Окна, стёкла</string>
+	<string name="poi_hardware">Скобяные изделия и инструмент</string>
+	<string name="poi_hearing_aids">Слуховые аппараты</string>
 	<string name="poi_herbalist">Травы (народная медицина)</string>
-	<string name="poi_hifi_shop">Hi-Fi аппаратура</string>
-	<string name="poi_houseware_shop">Хозяйственные товары</string>
-	<string name="poi_hunting_shop">Охотничий магазин</string>
-	<string name="poi_interior_decoration_shop">Декор и оформление</string>
-	<string name="poi_jewelry_shop">Ювелирный магазин</string>
+	<string name="poi_hifi">Hi-Fi аппаратура</string>
+	<string name="poi_houseware">Хозяйственные товары</string>
+	<string name="poi_hunting">Охотничий магазин</string>
+	<string name="poi_interior_decoration">Декор и оформление</string>
+	<string name="poi_jewelry">Ювелирный магазин</string>
 	<string name="poi_kiosk">Киоск, ларёк</string>
-	<string name="poi_kitchen_shop">Кухни</string>
-	<string name="poi_mobile_phone_shop">Салон связи</string>
-	<string name="poi_motorcycle_shop">Мотоциклы</string>
-	<string name="poi_musical_instrument_shop">Музыкальные инструменты</string>
-	<string name="poi_newsagent_shop">Журнальный киоск</string>
+	<string name="poi_kitchen">Кухонные принадлежности</string>
+	<string name="poi_mobile_phone">Салон связи</string>
+	<string name="poi_motorcycle">Мотоциклы</string>
+	<string name="poi_musical_instrument">Музыкальные инструменты</string>
+	<string name="poi_newsagent">Журнальный киоск</string>
 	<string name="poi_optician_shop">Оптика</string>
-	<string name="poi_organic_shop">Натуральные продукты</string>
-	<string name="poi_outdoor_shop">Товары для активного отдыха</string>
-	<string name="poi_paint_shop">Краски</string>
-	<string name="poi_pet_shop">Зоомагазин</string>
-	<string name="poi_radiotechnics_shop">Радиодетали</string>
+	<string name="poi_organic">Натуральные продукты</string>
+	<string name="poi_outdoor">Товары для активного отдыха</string>
+	<string name="poi_paint">Краски</string>
+	<string name="poi_pet">Зоомагазин</string>
+	<string name="poi_radiotechnics">Радиодетали</string>
 	<string name="poi_second_hand">Секонд-хенд</string>
 	<string name="poi_ship_chandler">Яхты, запчасти, оснастка</string>
-	<string name="poi_sports_shop">Спорттовары</string>
-	<string name="poi_stationery_shop">Канцелярские товары</string>
-	<string name="poi_tableware_shop">Кухонные принадлежности</string>
-	<string name="poi_ticket_shop">Продажа, бронирование билетов</string>
-	<string name="poi_tobacco_shop">Табак</string>
-	<string name="poi_toys_shop">Игрушки</string>
-	<string name="poi_trade_shop">Оптовый склад</string>
-	<string name="poi_vacuum_cleaner_shop">Пылесосы и аксессуары</string>
+	<string name="poi_sports">Спорттовары</string>
+	<string name="poi_stationery">Канцелярские товары</string>
+	<string name="poi_tableware">Кухонные принадлежности</string>
+	<string name="poi_ticket">Продажа, бронирование билетов</string>
+	<string name="poi_tobacco">Табак</string>
+	<string name="poi_toys">Игрушки</string>
+	<string name="poi_trade">Оптовый склад</string>
+	<string name="poi_vacuum_cleaner">Пылесосы и аксессуары</string>
 	<string name="poi_variety_store">Всё по одной цене</string>
-	<string name="poi_video_shop">Продажа, прокат DVD</string>
-	<string name="poi_window_blind_shop">Жалюзи, ставни, маркизы</string>
+	<string name="poi_video">Продажа, прокат DVD</string>
+	<string name="poi_window_blind">Жалюзи, ставни, маркизы</string>
 	<string name="poi_department_store">Универмаг</string>
-	<string name="poi_electronics_shop">Электроника</string>
+	<string name="poi_electronics">Электроника</string>
 	<string name="poi_car_shop">Автосалон</string>
 	<string name="poi_car_parts_shop">Автозапчасти</string>
-	<string name="poi_atv_shop">Квадроциклы</string>
-	<string name="poi_cosmetics_shop">Косметика, парфюмерия</string>
+	<string name="poi_atv">Квадроциклы</string>
+	<string name="poi_cosmetics">Косметика, парфюмерия</string>
 	<string name="poi_marketplace">Рынок</string>
-	<string name="poi_sewing_shop">Шитьё и рукоделие</string>
+	<string name="poi_sewing">Шитьё и рукоделие</string>
 
 	<string name="poi_police">Отделение полиции</string>
 	<string name="poi_fire_station">Пожарная часть</string>
@@ -145,7 +145,7 @@
 	<string name="poi_railway_station">Ж/д станция</string>
 	<string name="poi_railway_platform">Ж/д платформа</string>
 	<string name="poi_railway_halt">Ж/д платформа</string>
-	<string name="poi_subway_entrance">Вход в метро</string>
+	<string name="poi_railway_subway_entrance">Вход в метро</string>
 	<string name="poi_subway_station">Станция метро</string>
 	<string name="poi_taxi">Стоянка такси</string>
 
@@ -240,7 +240,7 @@
 	<string name="poi_pension_fund">Пенсионый фонд</string>
 	<string name="poi_migration">Миграционная служба</string>
 	<string name="poi_tax_inspection">Налоговая</string>
-	<string name="poi_administrative_office">Административное учреждение</string>
+	<string name="poi_office_administrative">Административное учреждение</string>
 	<string name="poi_customs">Таможенный пункт</string>
 
 	<string name="poi_pharmacy">Аптека</string>
@@ -271,14 +271,14 @@
 	<string name="poi_insurance">Страховая компания</string>
 	<string name="poi_estate_agent">Агентство недвижимости</string>
 	<string name="poi_lawyer">Юридические услуги</string>
-	<string name="poi_telecommunication_office">Телекоммуникационная компания</string>
+	<string name="poi_office_telecommunication">Телекоммуникационная компания</string>
 	<string name="poi_ngo">Общественная организация</string>
 	<string name="poi_town_hall">Администрация населенного пункта</string>
 	<string name="poi_employment_agency">Биржа труда</string>
-	<string name="poi_research_office">Исследовательский центр</string>
-	<string name="poi_it_office">Информационные технологии</string>
-	<string name="poi_newspaper_office">Печатное издание</string>
-	<string name="poi_architect_office">Архитектура, офис</string>
+	<string name="poi_research">Исследовательский центр</string>
+	<string name="poi_it">Информационные технологии</string>
+	<string name="poi_newspaper">Печатное издание</string>
+	<string name="poi_architect">Архитектура, офис</string>
 	<string name="poi_advertising_agency">Рекламное агентство</string>
 	<string name="poi_educational_institution">Образовательное учреждение (администрация)</string>
 	<string name="poi_studio">Студия звукозаписи, телестудия</string>
@@ -355,11 +355,11 @@
 	<string name="poi_city_gate">Городские ворота</string>
 	<string name="poi_fort">Фортификационные сооружения</string>
 	<string name="poi_fountain">Фонтан</string>
-	<string name="poi_ruins_historic">Исторические руины</string>
+	<string name="poi_historic_ruins">Исторические руины</string>
 	<string name="poi_rune_stone">Рунический камень</string>
 	<string name="poi_wreck">Место кораблекрушения</string>
-	<string name="poi_ship_historic">Судно (музей)</string>
-	<string name="poi_mine_historic">Историческая шахта</string>
+	<string name="poi_historic_ship">Судно (музей)</string>
+	<string name="poi_historic_mine">Историческая шахта</string>
 	<string name="poi_monument">Монумент (памятник)</string>
 	<string name="poi_zoo">Зоопарк</string>
 	<string name="poi_theme_park">Парк развлечений</string>
@@ -372,19 +372,19 @@
 	<string name="poi_chalet">Шале</string>
 
 	<string name="poi_place_of_worship">Место поклонения</string>
-	<string name="poi_place_of_worship_christian">Храм, церковь (часовня)</string>
-	<string name="poi_place_of_worship_jewish">Синагога</string>
-	<string name="poi_place_of_worship_muslim">Мечеть</string>
-	<string name="poi_place_of_worship_sikh">Место поклонения: сикхизм</string>
-	<string name="poi_place_of_worship_buddhist">Место поклонения: буддизм</string>
-	<string name="poi_place_of_worship_hindu">Место поклонения: индуизм</string>
-	<string name="poi_place_of_worship_shinto">Место поклонения: синтоизм</string>
-	<string name="poi_place_of_worship_taoist">Место поклонения: даосизм</string>
+	<string name="poi_religion_christian">Храм, церковь (часовня)</string>
+	<string name="poi_religion_jewish">Синагога</string>
+	<string name="poi_religion_muslim">Мечеть</string>
+	<string name="poi_religion_sikh">Место поклонения: сикхизм</string>
+	<string name="poi_religion_buddhist">Место поклонения: буддизм</string>
+	<string name="poi_religion_hindu">Место поклонения: индуизм</string>
+	<string name="poi_religion_shinto">Место поклонения: синтоизм</string>
+	<string name="poi_religion_taoist">Место поклонения: даосизм</string>
 	<string name="poi_monastery">Монастырь</string>
 	<string name="poi_historic_monastery">Исторический монастырь</string>
 	<string name="poi_wayside_cross">Придорожный крест</string>
 	<string name="poi_wayside_shrine">Придорожная святыня</string>
-	<string name="poi_tourism_information">Информационный стенд</string>
+	<string name="poi_information">Информационный стенд</string>
 	<string name="poi_clock">Часы</string>
 	<string name="poi_travel_agent">Турагенство</string>
 	<string name="poi_viewpoint">Место с хорошим видом</string>
@@ -436,7 +436,7 @@
 	<string name="poi_stripclub">Стрипклуб</string>
 	<string name="poi_beach_resort">Пляжный комплекс</string>
 	<string name="poi_dog_park">Площадка для выгула собак</string>
-	<string name="poi_fishing_place">Место для рыбалки</string>
+	<string name="poi_leisure_fishing">Место для рыбалки</string>
 	<string name="poi_hunting_stand">Охотничья вышка</string>
 	<string name="poi_marina">Пристань, яхт-клуб</string>
 	<string name="poi_miniature_golf">Мини-гольф</string>
@@ -455,58 +455,58 @@
 	<string name="poi_drinking_water">Питьевая вода</string>
 	<string name="poi_barbecue">Установка для барбекю</string>
 
-	<string name="poi_agricultural_engines_craft">Ремонт с/х техники</string>
-	<string name="poi_basket_maker">Плетение из лозы</string>
-	<string name="poi_beekeeper">Пасека</string>
-	<string name="poi_blacksmith">Кузница</string>
-	<string name="poi_brewery">Пивоварня</string>
-	<string name="poi_boatbuilder">Верфь</string>
-	<string name="poi_bookbinder">Переплётная мастерская</string>
-	<string name="poi_carpenter">Столярная мастерская</string>
-	<string name="poi_carpet_layer">Укладка ковров, ковролина</string>
-	<string name="poi_caterer">Кейтеринг</string>
-	<string name="poi_clockmaker">Часовая мастерская</string>
-	<string name="poi_dressmaker">Пошив, ремонт одежды</string>
-	<string name="poi_electrician">Электрик</string>
-	<string name="poi_gardener">Садовник, ландшафтный дизайнер</string>
-	<string name="poi_glaziery_craft">Стеклорезная мастерская</string>
-	<string name="poi_handicraft">Рукодельные штуки, украшения</string>
-	<string name="poi_hvac">Монтаж кондиционеров, систем вентиляции</string>
-	<string name="poi_insulation_craft">Услуги по утеплению помещений</string>
-	<string name="poi_jeweller">Ювелирная мастерская</string>
-	<string name="poi_locksmith">Слесарные работы</string>
-	<string name="poi_key_cutter">Изготовление ключей</string>
-	<string name="poi_metal_construction_craft">Металлоконструкции</string>
-	<string name="poi_optician">Изготовление, подгонка очков, линз</string>
-	<string name="poi_painter">Маляр</string>
-	<string name="poi_parquet_layer">Паркетные работы</string>
-	<string name="poi_photographer">Фотограф</string>
-	<string name="poi_photographic_laboratory">Фотолаборатория</string>
-	<string name="poi_plasterer">Штукатурные работы</string>
-	<string name="poi_plumber">Сантехник</string>
-	<string name="poi_pottery_craft">Гончарная мастерская</string>
-	<string name="poi_rigger">Оснастка для яхт, катеров</string>
-	<string name="poi_roofer">Кровельщик</string>
-	<string name="poi_saddler">Пошив и ремонт автокресел</string>
-	<string name="poi_sailmaker">Пошив и ремонт парусов</string>
-	<string name="poi_sawmill">Пилорама</string>
-	<string name="poi_scaffolder">Возведение строительных лесов</string>
-	<string name="poi_sculptor">Скульптор</string>
-	<string name="poi_shoemaker">Обувная мастерская</string>
-	<string name="poi_stand_builder">Изготовление выставочных стендов</string>
-	<string name="poi_stonemason">Камнерезная мастерская</string>
-	<string name="poi_sun_protection_craft">Изготовление навесов, жалюзи</string>
-	<string name="poi_sweep">Трубочист</string>
-	<string name="poi_tailor">Ателье</string>
-	<string name="poi_tiler">Плиточные работы</string>
-	<string name="poi_tinsmith">Жестянщик, лудильщик</string>
-	<string name="poi_upholsterer">Драпировщик, обивка мебели</string>
-	<string name="poi_watchmaker">Часовщик</string>
-	<string name="poi_window_construction">Изготовление окон</string>
+	<string name="poi_craft_agricultural_engines">Ремонт с/х техники</string>
+	<string name="poi_craft_basket_maker">Плетение из лозы</string>
+	<string name="poi_craft_beekeeper">Пасека</string>
+	<string name="poi_craft_blacksmith">Кузница</string>
+	<string name="poi_craft_brewery">Пивоварня</string>
+	<string name="poi_craft_boatbuilder">Верфь</string>
+	<string name="poi_craft_bookbinder">Переплётная мастерская</string>
+	<string name="poi_craft_carpenter">Столярная мастерская</string>
+	<string name="poi_craft_carpet_layer">Укладка ковров, ковролина</string>
+	<string name="poi_craft_caterer">Кейтеринг</string>
+	<string name="poi_craft_clockmaker">Часовая мастерская</string>
+	<string name="poi_craft_dressmaker">Пошив, ремонт одежды</string>
+	<string name="poi_craft_electrician">Электрик</string>
+	<string name="poi_craft_gardener">Садовник, ландшафтный дизайнер</string>
+	<string name="poi_craft_glaziery">Стеклорезная мастерская</string>
+	<string name="poi_craft_handicraft">Рукодельные штуки, украшения</string>
+	<string name="poi_craft_hvac">Монтаж кондиционеров, систем вентиляции</string>
+	<string name="poi_craft_insulation">Услуги по утеплению помещений</string>
+	<string name="poi_craft_jeweller">Ювелирная мастерская</string>
+	<string name="poi_craft_locksmith">Слесарные работы</string>
+	<string name="poi_craft_key_cutter">Изготовление ключей</string>
+	<string name="poi_craft_metal_construction">Металлоконструкции</string>
+	<string name="poi_craft_optician">Изготовление, подгонка очков, линз</string>
+	<string name="poi_craft_painter">Маляр</string>
+	<string name="poi_craft_parquet_layer">Паркетные работы</string>
+	<string name="poi_craft_photographer">Фотограф</string>
+	<string name="poi_craft_photographic_laboratory">Фотолаборатория</string>
+	<string name="poi_craft_plasterer">Штукатурные работы</string>
+	<string name="poi_craft_plumber">Сантехник</string>
+	<string name="poi_craft_pottery">Гончарная мастерская</string>
+	<string name="poi_craft_rigger">Оснастка для яхт, катеров</string>
+	<string name="poi_craft_roofer">Кровельщик</string>
+	<string name="poi_craft_saddler">Пошив и ремонт автокресел</string>
+	<string name="poi_craft_sailmaker">Пошив и ремонт парусов</string>
+	<string name="poi_craft_sawmill">Пилорама</string>
+	<string name="poi_craft_scaffolder">Возведение строительных лесов</string>
+	<string name="poi_craft_sculptor">Скульптор</string>
+	<string name="poi_craft_shoemaker">Обувная мастерская</string>
+	<string name="poi_craft_stand_builder">Изготовление выставочных стендов</string>
+	<string name="poi_craft_stonemason">Камнерезная мастерская</string>
+	<string name="poi_craft_sun_protection">Изготовление навесов, жалюзи</string>
+	<string name="poi_craft_sweep">Трубочист</string>
+	<string name="poi_craft_tailor">Ателье</string>
+	<string name="poi_craft_tiler">Плиточные работы</string>
+	<string name="poi_craft_tinsmith">Жестянщик, лудильщик</string>
+	<string name="poi_craft_upholsterer">Драпировщик, обивка мебели</string>
+	<string name="poi_craft_watchmaker">Часовщик</string>
+	<string name="poi_craft_window_construction">Изготовление окон</string>
 
 	<string name="poi_funeral_directors">Ритуальные услуги</string>
-	<string name="poi_computer_craft">Сборка компьютеров</string>
-	<string name="poi_beauty_salon">Салон красоты</string>
+	<string name="poi_craft_computer">Сборка компьютеров</string>
+	<string name="poi_beauty">Салон красоты</string>
 	<string name="poi_beauty_salon_nails">Маникюрный салон</string>
 	<string name="poi_hairdresser">Парикмахерская</string>
 	<string name="poi_massage">Массажный салон</string>
@@ -529,7 +529,7 @@
 	<string name="poi_pawnbroker">Ломбард</string>
 	<string name="poi_currencyexchange">Обмен валют</string>
 	<string name="poi_accountant">Бухгалтерские услуги</string>
-	<string name="poi_bitcoin_yes">Оплата bitcoin</string>
+	<string name="poi_bitcoin">Оплата bitcoin</string>
 
 	<string name="poi_cave_entrance">Вход в пещеру</string>
 	<string name="poi_peak">Горная вершина</string>
@@ -565,7 +565,7 @@
 	<string name="poi_seamark_buoy_installation">Знак изолированной опасности</string>
 	<string name="poi_seamark_buoy_isolated_danger">Буй (изолированная опасность)</string>
 	<string name="poi_seamark_buoy_lateral">Латеральный буй</string>
-	<string name="poi_seamark_buoy_safe_water"/>
+	<string name="poi_seamark_buoy_safe_water">Буй</string>
 	<string name="poi_seamark_buoy_special_purpose">Специальный буй</string>
 	<string name="poi_seamark_daymark">Дневной маяк</string>
 	<string name="poi_seamark_distance_mark">Отметка расстояния</string>
@@ -573,10 +573,10 @@
 	<string name="poi_seamark_dyke"/>
 	<string name="poi_seamark_floating_dock">Плавучий док</string>
 	<string name="poi_seamark_fog_signal">Сигнал при тумане</string>
-	<string name="poi_seamark_harbour_basin"/>
+	<string name="poi_seamark_harbour_basin">Акватория гавани</string>
 	<string name="poi_seamark_harbour">Гавань</string>
 	<string name="poi_seamark_landmark">Ориентир</string>
-	<string name="poi_seamark_light"/>
+	<string name="poi_seamark_light">Маяк</string>
 	<string name="poi_seamark_light_major"/>
 	<string name="poi_seamark_light_minor"/>
 	<string name="poi_seamark_light_float"/>
@@ -630,7 +630,7 @@
 	<string name="poi_surfing">Серфинг</string>
 	<string name="poi_cannon">Исторические пушки</string>
 	<string name="poi_harbour">Гавань</string>
-	<string name="poi_ferris_wheel">Колесо обозрения</string>
+	<string name="poi_big_wheel">Колесо обозрения</string>
 	<string name="poi_carousel">Карусель</string>
 	<string name="poi_maze">Лабиринт</string>
 	<string name="poi_swing_carousel">Качели-карусели</string>
@@ -665,5 +665,20 @@
 
 	<string name="poi_car">Автомобильный магазин</string>
 	<string name="poi_car_parts">Автозапчасти</string>
-	<string name="poi_halt">Железнодорожная остановка (устаревший)</string>
+	<string name="poi_halt">Железнодорожная остановка</string>
+	<string name="poi_emergency">Экстренные службы</string>
+	<string name="poi_transportation">Транспорт</string>
+	<string name="poi_healthcare">Здоровье</string>
+	<string name="poi_sustenance">Еда</string>
+	<string name="poi_lodging">Проживание</string>
+	<string name="poi_man_made">Инфраструктура</string>
+	<string name="poi_administrative">Административные объекты</string>
+	<string name="poi_seamark">Морские объекты</string>
+	<string name="poi_internet_access_wlan">Доступ в Интернет: wlan</string>
+	<string name="poi_internet_access_terminal">Доступ в Интернет: терминал</string>
+	<string name="poi_internet_access_wired">Доступ в Интернет: проводное подключение</string>
+	<string name="poi_internet_access_public">Доступ в Интернет: общедоступный</string>
+	<string name="poi_internet_access_service">Доступ в Интернет: сервис</string>
+	
+	<string name="poi_farm">Фермерский магазин</string>
 	</resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 493c601d5b..cc8fa17fb0 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
     <string name="osmo_use_https">Использовать HTTPS</string>
-    <string name="srtm_plugin_description">Плагин позволяет загружать контурные линии и затемнение высот для использования оффлайн (\"Настройки\" → \"Управление файлами карт\" → \"Загрузить\").</string>
+    <string name="srtm_plugin_description">"Плагин обеспечивает наложение контурных линий и (рельефа) затемняющего слоя, которые будут отображаться поверх оффлайн карт OsmAnd. Эта функция высоко оценится спортсменами, туристами, путешественниками и всеми, кто заинтересован в рельефной структуре ландшафта.\n\nГлобальные данные (между 70 градусов на севере и 70 градусов на юге) основываются на измерениях SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), инструментом визуализации Terra, флагманского спутника Земли системы наблюдения NASA. ASTER является результатом совместных усилий NASA, министерства экономики Японии, торговли и промышленности (METI), космических систем Японии (J-spacesystems). "</string>
     <string name="srtm_paid_version_msg">Рассмотрите, пожалуйста, покупку плагина \"Линии высот\" в Google Play, чтобы поддержать последующую разработку.</string>
     <string name="srtm_paid_version_title">Линии высот</string>
     <string name="av_def_action_video">Запись видео</string>
@@ -42,7 +42,7 @@
     <string name="audionotes_location_not_defined">Текущее местоположение для заметки ещё не определено. Используйте контекстное меню для привязки заметки к определённой точке</string>
     
     <string name="map_widget_audionotes">Аудио заметки</string>
-    <string name="audionotes_plugin_description">Этот плагин предоставляет возможность делать аудио-видео заметки во время путешествия</string>
+    <string name="audionotes_plugin_description">Плагин аудио/видео заметки предоставляет функциональные возможности по созданию аудио/фото/видео записей во время поездки, либо с помощью кнопки на экране карты, либо непосредственно через контекстное меню для любой позиции на карте.</string>
     <string name="audionotes_plugin_name">Аудио-видео заметки</string>
     <string name="index_srtm_parts">частей</string>
     <string name="index_srtm_ele">Линии высот</string>
@@ -122,7 +122,8 @@
   <string name="online_map_settings_descr">Настройки источников онлайн карт и слоёв</string>
   
   
-  <string name="osmand_rastermaps_plugin_description">Этот плагин позволяет использовать различные источники онлайн карт, а также подготовленные растровые карты в качестве базовой карты или подложки/покрытия. Карты могут быть подготовлены на компьютере и скопированы в папку данных OsmAnd.</string>
+  <string name="osmand_rastermaps_plugin_description">"С помощью этого плагина вы можете получить доступ ко множеству видов интернет карт (тайловых или растровых), от предопределенных тайловых OpenStreetMap (Mapnik) до спутниковых изображений и специальных слоев назначения, таких как карты погоды, климатические карты, геологических карты, слои затемнения высот и т.д.
+\nЛюбая из этих карт может быть использована в качестве основной (базовой) карты для отображения на экране OsmAnd или в виде наложения/подложки к другой базовой карте (обычной оффлайн карте OsmAnd). Для того чтобы сделать любую подложку более видимой, некоторые элементы векторной карты OsmAnd могут быть по желанию легко скрыты через меню \"Настройка карты\".\nТайловые карты могут быть получены непосредственно с помощью онлайн-источников или могут быть подготовлены для использования в автономном режиме (и вручную скопированы в папку данных OsmAnd) в качестве базы данных SQLite, которая может быть получена с помощью различных инструментов подготовки карт сторонних производителей. "</string>
   <string name="osmand_background_plugin_description">Этот плагин предоставляет навигацию и запись маршрутов в энергосберегающем режиме. Плагин работает в фоновом режиме и периодически активизирует GPS для записи маршрута или воспроизведения голосовых команд.</string>
   <string name="osmand_accessibility_description">Этот плагин содержит настройки для дополнительных возможностей (accessibility).</string>
   
@@ -1150,7 +1151,7 @@
     <string name="recording_context_menu_precord">Сделать фото</string>
     <string name="dropbox_plugin_description">Плагин Dropbox позволяет синхронизировать треки и видео/аудио заметки с вашим аккаунтом dropbox.</string>
     <string name="dropbox_plugin_name">Плагин Dropbox</string>
-    <string name="osmand_srtm_long_description_1000_chars">Этот плагин предоставляет контурные линии, которые могут отображаться в оффлайн картах OsmAnd. Глобальные данные (между 70 градусов на севере и 70 градусов на юге) основываются на измерениях SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), инструментом визуализации Terra, флагманского спутника Земли системы наблюдения NASA. ASTER является результатом совместных усилий NASA, министерства экономики Японии, торговли и промышленности (METI), космических систем Японии (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">"Плагин обеспечивает наложение контурных линии и (рельефа) затемняющего слоя, которые будут отображаться поверх оффлайн карт OsmAnd. Эта функция высоко оценится спортсменами, туристами, путешественниками и всеми, кто заинтересован в рельефной структуре ландшафта.\n\nГлобальные данные (между 70 градусов на севере и 70 градусов на юге) основываются на измерениях SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), инструментом визуализации Terra, флагманского спутника Земли системы наблюдения NASA. ASTER является результатом совместных усилий NASA, министерства экономики Японии, торговли и промышленности (METI), космических систем Японии (J-spacesystems). "</string>
     <string name="recording_photo_description">Фото %1$s %2$s</string>
     <string name="local_indexes_cat_av">Аудио/Видео данные</string>
     <string name="stop_routing_confirm">Вы уверены, что хотите остановить навигацию?</string>
@@ -1266,7 +1267,7 @@
     <string name="other_location">Другие</string>
     <string name="local_indexes_cat_srtm">Данные горизонталей</string>
     <string name="shared_string_downloading">Загрузка…</string>
-	<string name="osmand_distance_planning_plugin_description">Создание путей (или модификация существующего файла GPX) для измерения дистанции между точками. Сохранить как GPX (может использоваться для планирования маршрутов GPX).</string>
+	<string name="osmand_distance_planning_plugin_description">Плагин добавляет виджет на экран карты, позволяющий создавать маршруты, нажав на карте, а также использовать или изменять существующие файлы GPX, планировать поездку и измерять расстояние между точками. Результаты могут быть сохранены в виде файла GPX, который впоследствии может быть использован для навигации.</string>
     <string name="context_menu_item_destination_point">Пункт назначения</string>
     <string name="please_select_address">Сначала выберите город или улицу</string>
     <string name="destination_point">Пункт назначения %1$s</string>
@@ -1491,7 +1492,7 @@
 	<string name="share_route_as_gpx">Поделиться маршрутом используя файл GPX</string>
 	<string name="osmo_settings_uuid">Ключ доступа</string>
     <string name="osmo_settings_descr">Настройка параметров мониторинга и установка персонального канала мониторинга</string>
-    <string name="osmo_plugin_description">OpenStreetMap Мониторинг - продвинутый живой мониторинг с множеством средств удалённого контроля http://osmo.mobi</string>
+    <string name="osmo_plugin_description">"Плагин обеспечивает функциональность для расширенного живого мониторинга OsMo, см http://osmo.mobi.\n\nОн позволяет отслеживать другие устройства и отслеживаться самому. Вы можете создавать анонимные группы, делиться друг с другом местоположением и общаться. Возможны различные варианты опций для отслеживания сессии или постоянного слежения.\n\nАнонимные группы создаются для указанного количества дней и ограниченным функционалом, то есть нет дистанционного управления и нет администратора группы. Полностью функциональные группы, с другой стороны, могут быть созданы на веб-сайте и только зарегистрированные пользователи имеют к ним доступ. "</string>
     <string name="osmo_plugin_name">OsMo мониторинг</string>
     <string name="osmo_settings">OsMo мониторинг</string>
    	<string name="navigation_intent_invalid">Неправильный формат: %s</string>
@@ -1715,7 +1716,8 @@
     <string name="save_track_to_gpx_globally">Запись трека в файл GPX</string>
 	<string name="save_track_interval_globally">Интервал записи</string>
 	<string name="save_track_to_gpx_globally_descr">Общие положения записи в файл GPX могут быть включены или выключены с помощью виджета записи GPX на экране карты</string>
-	<string name="record_plugin_description">Сохранение ваших треков с помощью кнопки на экране с картой. Отображение настроек записи треков в локальные GPX-файлы или онлайн, в web-сервис.</string>
+	<string name="record_plugin_description">"Плагин активирует функции для записи и сохранения ваших треков вручную нажатием на виджет записи GPX на экране карты, или также автоматически записывает все ваши маршруты навигации в файл GPX.
+\n\nЗаписанными треками можно поделиться с вашими друзьями или использовать их для вклада в OSM. Спортсмены могут использовать записанные треки для контроля за тренировками. Некоторый базовый анализ треков может быть выполнен непосредственно в OsmAnd, например, время прохождения круга, средняя скорость и т.д., треки, конечно, позднее также могут быть проанализированы в специальных инструментах анализа  сторонних производителей. "</string>
     <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> карта с картинками</string>
 	<string name="confirm_every_run">Всегда спрашивать</string>
 	<string name="save_global_track_interval_descr">Выберите интервал для записи трека (включается через виджет записи GPX на карте)</string>
@@ -1918,4 +1920,13 @@
     <string name="tips_and_tricks_descr">Часто задаваемые вопросы, последние изменения и другое</string>
     <string name="simulate_your_location">Моделировать ваше местоположение</string>
     <string name="shared_string_collapse">Свернуть</string>
+	<string name="action_delete">Удалить действие</string>
+	<string name="action_modify">Изменить действие</string>
+	<string name="action_create">Создать действие</string>
+	<string name="osm_edits">OSM правки</string>
+	<string name="osmand_parking_hour">ч</string><string name="osmand_parking_minute">м</string><string name="osmand_parking_time_left">Осталось</string> <string name="parking_place_limited">Ограниченное по времени парковочное место</string>
+	<string name="your_edits">Ваши правки</string>
+    <string name="waypoint_visit_after">Посетить после</string>
+    <string name="waypoint_visit_before">Посетить до</string>
+    <string name="plugin_touringview_name">Туристическая карта</string>
 	</resources>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index e4e039de8e..fd6df1d423 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -18,70 +18,70 @@
 	<string name="poi_dairy">Lateria</string>
 	<string name="poi_vending_machine">Distribudore automàticu</string>
 
-	<string name="poi_bookshop">Libreria</string>
-	<string name="poi_bicycle_shop">Butega de bitziclètas</string>
-	<string name="poi_anime_shop">Butega de ànime</string>
-	<string name="poi_antiques_shop">Anticuariadu</string>
-	<string name="poi_art_shop">Butega d\'arte</string>
+	<string name="poi_books">Libreria</string>
+	<string name="poi_bicycle">Butega de bitziclètas</string>
+	<string name="poi_anime">Butega de ànime</string>
+	<string name="poi_antiques">Anticuariadu</string>
+	<string name="poi_art">Butega d\'arte</string>
 	<string name="poi_baby_goods">Butega pro pitzinnos</string>
-	<string name="poi_bag_shop">Valigeria</string>
-	<string name="poi_bathroom_furnishing_shop">Arredu bagnu</string>
-	<string name="poi_bed_shop">Arredu aposentu de letu</string>
+	<string name="poi_bag">Valigeria</string>
+	<string name="poi_bathroom_furnishing">Arredu bagnu</string>
+	<string name="poi_bed">Arredu aposentu de letu</string>
 	<string name="poi_boutique">Butega de moda</string>
-	<string name="poi_carpet_shop">Butega de tapetes</string>
-	<string name="poi_chemist_shop">Potecaria</string>
-	<string name="poi_clothes_shop">Bestimenta</string>
-	<string name="poi_children_clothes_shop">Bestimenta pro pitzinnos</string>
+	<string name="poi_carpet">Butega de tapetes</string>
+	<string name="poi_chemist">Potecaria</string>
+	<string name="poi_clothes">Bestimenta</string>
+	<string name="poi_children_clothes">Bestimenta pro pitzinnos</string>
 	<string name="poi_shoes">Butega de iscarpas</string>
-	<string name="poi_computer_shop">Butega de informàtica</string>
+	<string name="poi_computer">Butega de informàtica</string>
 	<string name="poi_copyshop">Copisteria</string>
-	<string name="poi_curtain_shop">Butega pro su campègiu</string>
-	<string name="poi_fabric_shop">Butega de drapègios</string>
-	<string name="poi_bedding_shop">Butega de banitas</string>
-	<string name="poi_dive_shop">Butega de artìculos pro imberghidura</string>
-	<string name="poi_doityourself_shop">Butega de artìculos pro su bricolage</string>
-	<string name="poi_erotic_shop">Sexy shop</string>
-	<string name="poi_fishing_shop">Butega pro sa pisca</string>
+	<string name="poi_curtain">Butega pro su campègiu</string>
+	<string name="poi_fabric">Butega de drapègios</string>
+	<string name="poi_bedding">Butega de banitas</string>
+	<string name="poi_dive">Butega de artìculos pro imberghidura</string>
+	<string name="poi_doityourself">Butega de artìculos pro su bricolage</string>
+	<string name="poi_erotic">Sexy shop</string>
+	<string name="poi_fishing">Butega pro sa pisca</string>
 	<string name="poi_florist">Froraju</string>
-	<string name="poi_frame_shop">Curnisas</string>
-	<string name="poi_furniture_shop">Butega de mòbiles</string>
+	<string name="poi_frame">Curnisas</string>
+	<string name="poi_furniture">Butega de mòbiles</string>
 	<string name="poi_garden_centre">Artìculos pro su giardinu</string>
-	<string name="poi_gas_shop">Butega de gas lìcuidu</string>
-	<string name="poi_general_shop">Empòriu</string>
-	<string name="poi_gift_shop">Butega de donos</string>
-	<string name="poi_glaziery_shop">Bidreria</string>
-	<string name="poi_hardware_shop">Ferramenta</string>
-	<string name="poi_hearing_aids_shop">Butega aparitzos acùsticos</string>
+	<string name="poi_gas">Butega de gas lìcuidu</string>
+	<string name="poi_general">Empòriu</string>
+	<string name="poi_gift">Butega de donos</string>
+	<string name="poi_glaziery">Bidreria</string>
+	<string name="poi_hardware">Ferramenta</string>
+	<string name="poi_hearing_aids">Butega aparitzos acùsticos</string>
 	<string name="poi_herbalist">Erboristeria</string>
-	<string name="poi_hifi_shop">Butega HiFi</string>
-	<string name="poi_hunting_shop">Atretzadura pro cassa e pisca</string>
-	<string name="poi_interior_decoration_shop">Butega de decoradura d\'intèrnos</string>
-	<string name="poi_jewelry_shop">Butega de prendas</string>
-	<string name="poi_kitchen_shop">Artìculos pro sa coghina</string>
-	<string name="poi_mobile_phone_shop">Butega de telefonia mòbile</string>
-	<string name="poi_motorcycle_shop">Butega de mototzicletas</string>
-	<string name="poi_musical_instrument_shop">Istrumentos musicales</string>
-	<string name="poi_newsagent_shop">Agentzia de imprenta</string>
+	<string name="poi_hifi">Butega HiFi</string>
+	<string name="poi_hunting">Atretzadura pro cassa e pisca</string>
+	<string name="poi_interior_decoration">Butega de decoradura d\'intèrnos</string>
+	<string name="poi_jewelry">Butega de prendas</string>
+	<string name="poi_kitchen">Artìculos pro sa coghina</string>
+	<string name="poi_mobile_phone">Butega de telefonia mòbile</string>
+	<string name="poi_motorcycle">Butega de mototzicletas</string>
+	<string name="poi_musical_instrument">Istrumentos musicales</string>
+	<string name="poi_newsagent">Agentzia de imprenta</string>
 	<string name="poi_optician_shop">Optometrista</string>
-	<string name="poi_organic_shop">Alimentos biològicos</string>
-	<string name="poi_outdoor_shop">Artìculos pro s\'atividade a s\'abertu</string>
-	<string name="poi_paint_shop">Butega de artìculos pro sa pintadura</string>
-	<string name="poi_pet_shop">Butega de animales domèsticos</string>
-	<string name="poi_radiotechnics_shop">Butega pro radiotècnica</string>
+	<string name="poi_organic">Alimentos biològicos</string>
+	<string name="poi_outdoor">Artìculos pro s\'atividade a s\'abertu</string>
+	<string name="poi_paint">Butega de artìculos pro sa pintadura</string>
+	<string name="poi_pet">Butega de animales domèsticos</string>
+	<string name="poi_radiotechnics">Butega pro radiotècnica</string>
 	<string name="poi_second_hand">Butega de cosas de segunda manu</string>
 	<string name="poi_ship_chandler">Butega de nàutica</string>
-	<string name="poi_sports_shop">Artìculos isportivos</string>
-	<string name="poi_stationery_shop">Butega pro s\'ufìtziu</string>
-	<string name="poi_ticket_shop">Billeteria</string>
-	<string name="poi_tobacco_shop">Istancu</string>
-	<string name="poi_toys_shop">Butega de gioghitos</string>
-	<string name="poi_vacuum_cleaner_shop">Butega de suspidoras</string>
-	<string name="poi_video_shop">Videonolègiu</string>
-	<string name="poi_electronics_shop">Butega de eletrònica</string>
+	<string name="poi_sports">Artìculos isportivos</string>
+	<string name="poi_stationery">Butega pro s\'ufìtziu</string>
+	<string name="poi_ticket">Billeteria</string>
+	<string name="poi_tobacco">Istancu</string>
+	<string name="poi_toys">Butega de gioghitos</string>
+	<string name="poi_vacuum_cleaner">Butega de suspidoras</string>
+	<string name="poi_video">Videonolègiu</string>
+	<string name="poi_electronics">Butega de eletrònica</string>
 	<string name="poi_car_shop">Butega de automòbiles</string>
 	<string name="poi_car_parts_shop">Autoricàmbios</string>
-	<string name="poi_atv_shop">Butega de quad</string>
-	<string name="poi_cosmetics_shop">Butega de bellettos</string>
+	<string name="poi_atv">Butega de quad</string>
+	<string name="poi_cosmetics">Butega de bellettos</string>
 	<string name="poi_marketplace">Mercadu</string>
 	<string name="poi_police">Politzia</string>
 	<string name="poi_fire_station">Pompieres</string>
@@ -121,7 +121,7 @@
 	<string name="poi_railway_station">Istatzione de sos trenos</string>
 	<string name="poi_railway_platform">Piattaredda ferroviària</string>
 	<string name="poi_railway_halt">Firmada de sos trenos (disusada)</string>
-	<string name="poi_subway_entrance">Intrada de sa metropolitana</string>
+	<string name="poi_railway_subway_entrance">Intrada de sa metropolitana</string>
 	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
 
@@ -192,7 +192,7 @@
 	<string name="poi_prosecutor">Pùblicu ministeru</string>
 	<string name="poi_migration">Ufìtziu migratzione</string>
 	<string name="poi_tax_inspection">Guàrdia de finàntzia</string>
-	<string name="poi_administrative_office">Ufìtziu amministrativu</string>
+	<string name="poi_office_administrative">Ufìtziu amministrativu</string>
 	<string name="poi_city">Tzitade cabu-de-logu de provìntzia</string>
 	<string name="poi_town">Tzitade</string>
 	<string name="poi_village">Bidda</string>
@@ -227,9 +227,9 @@
 	<string name="poi_ngo">ONG</string>
 	<string name="poi_town_hall">Munitzìpiu</string>
 	<string name="poi_employment_agency">Ufìtziu pro su traballu</string>
-	<string name="poi_it_office">Ufìtziu IT</string>
-	<string name="poi_newspaper_office">Redatzione de giornale</string>
-	<string name="poi_architect_office">Istùdiu de architetura</string>
+	<string name="poi_it">Ufìtziu IT</string>
+	<string name="poi_newspaper">Redatzione de giornale</string>
+	<string name="poi_architect">Istùdiu de architetura</string>
 	<string name="poi_advertising_agency">Agentzia de publitzidade</string>
 	<string name="poi_educational_institution">Istitudu iscolàsticu</string>
 	<string name="poi_studio">Istùdiu de registratzione</string>
@@ -285,10 +285,10 @@
 	<string name="poi_city_gate">Ghenna de intrada a sa tzitade</string>
 	<string name="poi_fort">Forte</string>
 	<string name="poi_fountain">Funtana</string>
-	<string name="poi_ruins_historic">Ruinas istòricas</string>
+	<string name="poi_historic_ruins">Ruinas istòricas</string>
 	<string name="poi_rune_stone">Pedra rùnica</string>
-	<string name="poi_ship_historic">Nave istòrica</string>
-	<string name="poi_mine_historic">Cava istòrica</string>
+	<string name="poi_historic_ship">Nave istòrica</string>
+	<string name="poi_historic_mine">Cava istòrica</string>
 	<string name="poi_monument">Monumentu</string>
 	<string name="poi_zoo">Zoo</string>
 	<string name="poi_theme_park">Parcu a tema</string>
@@ -299,19 +299,19 @@
 	<string name="poi_chalet">Chalet</string>
 
 	<string name="poi_place_of_worship">Logu de cultu</string>
-	<string name="poi_place_of_worship_christian">Logu de cultu: cristianu</string>
-	<string name="poi_place_of_worship_jewish">Logu de cultu: ebreu</string>
-	<string name="poi_place_of_worship_muslim">Logu de cultu: musulmanu</string>
-	<string name="poi_place_of_worship_sikh">Logu de cultu: sikh</string>
-	<string name="poi_place_of_worship_buddhist">Logu de cultu: buddista</string>
-	<string name="poi_place_of_worship_hindu">Logu de cultu: induista</string>
-	<string name="poi_place_of_worship_shinto">Logu de cultu: shintoista</string>
-	<string name="poi_place_of_worship_taoist">Logu de cultu: taoista</string>
+	<string name="poi_religion_christian">Logu de cultu: cristianu</string>
+	<string name="poi_religion_jewish">Logu de cultu: ebreu</string>
+	<string name="poi_religion_muslim">Logu de cultu: musulmanu</string>
+	<string name="poi_religion_sikh">Logu de cultu: sikh</string>
+	<string name="poi_religion_buddhist">Logu de cultu: buddista</string>
+	<string name="poi_religion_hindu">Logu de cultu: induista</string>
+	<string name="poi_religion_shinto">Logu de cultu: shintoista</string>
+	<string name="poi_religion_taoist">Logu de cultu: taoista</string>
 	<string name="poi_monastery">Monastèriu/Muristene</string>
 	<string name="poi_historic_monastery">Monastèriu/Muristene istòricu</string>
 	<string name="poi_wayside_cross">Rughe istòrica</string>
 	<string name="poi_wayside_shrine">Tabernàculu istòricu</string>
-	<string name="poi_tourism_information">Informatziones turìsticas</string>
+	<string name="poi_information">Informatziones turìsticas</string>
 	<string name="poi_clock">Relògiu</string>
 	<string name="poi_travel_agent">Agentzia de biàgios</string>
 	<string name="poi_viewpoint">Puntu panoràmicu</string>
@@ -343,7 +343,7 @@
 	<string name="poi_place_farm">Fatoria</string>
 
 	<string name="poi_audiologist">Tècnicu audiometrista</string>
-	<string name="poi_research_office">Tzentru de chirca e isvilupu</string>
+	<string name="poi_research">Tzentru de chirca e isvilupu</string>
 	<string name="poi_club_art">Tzìrculu artìsticu</string>
 	<string name="poi_club_astronomy">Tzìrculu astròfilos</string>
 	<string name="poi_club_computer">Tzìrculu informàticu</string>
@@ -383,26 +383,26 @@
 	<string name="poi_bar">Tzilleri</string>
 	<string name="poi_pub">Pub</string>
 	<string name="poi_drinking_water">Abba potàbile</string>
-	<string name="poi_blacksmith">Mastru de ferru</string>
-	<string name="poi_brewery">Birrifìtziu</string>
-	<string name="poi_clockmaker">Relogiàrju</string>
-	<string name="poi_dressmaker">Draperi</string>
-	<string name="poi_electrician">Elettricista</string>
-	<string name="poi_gardener">Giardineri</string>
-	<string name="poi_glaziery_craft">Bidraju</string>
-	<string name="poi_handicraft">Artisanu</string>
-	<string name="poi_hvac">Caentamentu, bentuladura e conditzionamentu</string>
-	<string name="poi_insulation_craft">Isulamentu tèrmicu de sos edifìtzios</string>
-	<string name="poi_jeweller">Butegheri de prendas</string>
-	<string name="poi_optician">Òticu</string>
-	<string name="poi_painter">Pintore</string>
-	<string name="poi_photographer">Fotògrafu</string>
-	<string name="poi_photographic_laboratory">Laboratòriu fotogràficu</string>
-	<string name="poi_plasterer">Istucadore</string>
-	<string name="poi_plumber">Idràulicu</string>
-	<string name="poi_pottery_craft">Brocarju</string>
+	<string name="poi_craft_blacksmith">Mastru de ferru</string>
+	<string name="poi_craft_brewery">Birrifìtziu</string>
+	<string name="poi_craft_clockmaker">Relogiàrju</string>
+	<string name="poi_craft_dressmaker">Draperi</string>
+	<string name="poi_craft_electrician">Elettricista</string>
+	<string name="poi_craft_gardener">Giardineri</string>
+	<string name="poi_craft_glaziery">Bidraju</string>
+	<string name="poi_craft_handicraft">Artisanu</string>
+	<string name="poi_craft_hvac">Caentamentu, bentuladura e conditzionamentu</string>
+	<string name="poi_craft_insulation">Isulamentu tèrmicu de sos edifìtzios</string>
+	<string name="poi_craft_jeweller">Butegheri de prendas</string>
+	<string name="poi_craft_optician">Òticu</string>
+	<string name="poi_craft_painter">Pintore</string>
+	<string name="poi_craft_photographer">Fotògrafu</string>
+	<string name="poi_craft_photographic_laboratory">Laboratòriu fotogràficu</string>
+	<string name="poi_craft_plasterer">Istucadore</string>
+	<string name="poi_craft_plumber">Idràulicu</string>
+	<string name="poi_craft_pottery">Brocarju</string>
 	<string name="poi_boatyard">Cantieri navale</string>
-	<string name="poi_telecommunication_office">Ufìtziu de telecomunicatzione</string>
+	<string name="poi_office_telecommunication">Ufìtziu de telecomunicatzione</string>
 	<string name="poi_american_football">Football americanu</string>
 	<string name="poi_bmx_sport">BMX</string>
 	<string name="poi_canadian_football">Football canadesu</string>
@@ -411,24 +411,24 @@
 	<string name="poi_water_park">Parcu de abba</string>
 	<string name="poi_barbecue">Barbecue</string>
 
-	<string name="poi_basket_maker">Corbulaju</string>
-	<string name="poi_beekeeper">Abiàrgiu</string>
-	<string name="poi_boatbuilder">Costrutzione barcas</string>
-	<string name="poi_bookbinder">Rilegadore</string>
-	<string name="poi_locksmith">Mastru de ferru pro serràrgios</string>
-	<string name="poi_key_cutter">Duplicatzione craes</string>
-	<string name="poi_saddler">Seddaju</string>
-	<string name="poi_sailmaker">Velaju</string>
-	<string name="poi_sawmill">Segheria</string>
-	<string name="poi_scaffolder">Pontègios e impalcaduras</string>
-	<string name="poi_sculptor">Iscultore</string>
-	<string name="poi_shoemaker">Cartzeraju (mastru de iscarpas)</string>
-	<string name="poi_stonemason">Picapedreri</string>
-	<string name="poi_sun_protection_craft">Tendas pro su sole</string>
-	<string name="poi_sweep">Mundatzimineras</string>
-	<string name="poi_tailor">Draperi</string>
-	<string name="poi_tinsmith">Latoneri</string>
-	<string name="poi_upholsterer">Tapetzeri</string>
+	<string name="poi_craft_basket_maker">Corbulaju</string>
+	<string name="poi_craft_beekeeper">Abiàrgiu</string>
+	<string name="poi_craft_boatbuilder">Costrutzione barcas</string>
+	<string name="poi_craft_bookbinder">Rilegadore</string>
+	<string name="poi_craft_locksmith">Mastru de ferru pro serràrgios</string>
+	<string name="poi_craft_key_cutter">Duplicatzione craes</string>
+	<string name="poi_craft_saddler">Seddaju</string>
+	<string name="poi_craft_sailmaker">Velaju</string>
+	<string name="poi_craft_sawmill">Segheria</string>
+	<string name="poi_craft_scaffolder">Pontègios e impalcaduras</string>
+	<string name="poi_craft_sculptor">Iscultore</string>
+	<string name="poi_craft_shoemaker">Cartzeraju (mastru de iscarpas)</string>
+	<string name="poi_craft_stonemason">Picapedreri</string>
+	<string name="poi_craft_sun_protection">Tendas pro su sole</string>
+	<string name="poi_craft_sweep">Mundatzimineras</string>
+	<string name="poi_craft_tailor">Draperi</string>
+	<string name="poi_craft_tinsmith">Latoneri</string>
+	<string name="poi_craft_upholsterer">Tapetzeri</string>
 	<string name="poi_beauty_salon_nails">Tzentru ungras</string>
 	<string name="poi_tattoo">Tatuatore</string>
 	<string name="poi_sauna">Sauna</string>
@@ -438,7 +438,7 @@
 
 	<string name="poi_bank">Banca</string>
 	<string name="poi_atm">Bancomat</string>
-	<string name="poi_bitcoin_yes">Pagamentu Bitcoin</string>
+	<string name="poi_bitcoin">Pagamentu Bitcoin</string>
 
 	<string name="poi_cave_entrance">Intrada gruta</string>
 	<string name="poi_peak">Cùcuru de unu monte</string>
@@ -468,8 +468,8 @@
 	<string name="poi_military_range">Polìgonu militare</string>
 	<string name="poi_military_nuclear_explosion_site">Giassu esplosiones nucleares</string>
 <string name="poi_kiosk">Chioscu</string>
-	<string name="poi_houseware_shop">Butega de artìculos pro sa domo</string>
-	<string name="poi_tableware_shop">Butega de artìculos pro sa mesa</string>
+	<string name="poi_houseware">Butega de artìculos pro sa domo</string>
+	<string name="poi_tableware">Butega de artìculos pro sa mesa</string>
 	<string name="poi_variety_store">Butega de ogetos baratos</string>
 	<string name="poi_grit_bin">Cassione de arena</string>
 	<string name="poi_ambulance_station">Istatzione ambulàntzias</string>
@@ -477,8 +477,8 @@
 
 	<string name="poi_kindergarten">Parcu de giogos</string>
 	<string name="poi_company">Azienda</string>
-	<string name="poi_trade_shop">Trading post</string>
-	<string name="poi_window_blind_shop">Butega de bentanas tzurpas</string>
+	<string name="poi_trade">Trading post</string>
+	<string name="poi_window_blind">Butega de bentanas tzurpas</string>
 	<string name="poi_department_store">Supermercadu</string>
 	<string name="poi_aeroway_terminal">Terminal aeroportu</string>
 	<string name="poi_aeroway_gate">Gate aeroportu</string>
@@ -491,8 +491,8 @@
 	<string name="poi_occupational_therapist">Terapèuta ocupatzionale</string>
 	<string name="poi_leisure_track">Pista pro isports</string>
 	<string name="poi_raceway">Tzircùitu automobilìsticu</string>
-	<string name="poi_9pin">Nine pin bowling</string>
-	<string name="poi_10pin">Ten pin bowling</string>
+	<string name="poi_9pin">Bowling cun noe birìllos</string>
+	<string name="poi_10pin">Bowling cun deghe birìllos</string>
 	<string name="poi_base">Base jumping</string>
 	<string name="poi_bowls">Bowls</string>
 	<string name="poi_climbing">Aperrinzada</string>
@@ -511,16 +511,16 @@
 	<string name="poi_stripclub">Locale de ispogiamentos (Stripclub)</string>
 	<string name="poi_beach_resort">Istabilimentu balneare</string>
 	<string name="poi_dog_park">Parcu pro sos canes</string>
-	<string name="poi_fishing_place">Logu pro piscare</string>
+	<string name="poi_leisure_fishing">Logu pro piscare</string>
 	<string name="poi_miniature_golf">Mini golf</string>
 	<string name="poi_biergarten">Giardinu de sa birra (Biergarten)</string>
 	<string name="poi_fast_food">Fast food</string>
-	<string name="poi_caterer">Servìtziu de ristorazione</string>
-	<string name="poi_rigger">Atrezadura pro barcas a vela</string>
-	<string name="poi_roofer">Fraigadura e acontzamentu de cobertas</string>
-	<string name="poi_stand_builder">Ammàniu de bancos de bèndida</string>
-	<string name="poi_watchmaker">Relogiàiu</string>
-	<string name="poi_window_construction">Fraigadura de bentanas</string>
+	<string name="poi_craft_caterer">Servìtziu de ristorazione</string>
+	<string name="poi_craft_rigger">Atrezadura pro barcas a vela</string>
+	<string name="poi_craft_roofer">Fraigadura e acontzamentu de cobertas</string>
+	<string name="poi_craft_stand_builder">Ammàniu de bancos de bèndida</string>
+	<string name="poi_craft_watchmaker">Relogiàiu</string>
+	<string name="poi_craft_window_construction">Fraigadura de bentanas</string>
 
 	<string name="poi_toilets">Bagnu</string>
 	<string name="poi_currencyexchange">Cambiadore de valutas</string>
@@ -554,9 +554,9 @@
 	<string name="poi_wreck">Relitu navale</string>
 	<string name="poi_alpine_hut">Refùgiu alpinu</string>
 	<string name="poi_shelter">Cuadorju</string>
-	<string name="poi_metal_construction_craft">Costrutziones metàllicas</string>
-	<string name="poi_parquet_layer">Assentadore de parquet</string>
-	<string name="poi_tiler">Assentadore de regiolas</string>
+	<string name="poi_craft_metal_construction">Costrutziones metàllicas</string>
+	<string name="poi_craft_parquet_layer">Assentadore de parquet</string>
+	<string name="poi_craft_tiler">Assentadore de regiolas</string>
 	<string name="poi_seamark_radio_station">Istatzione ràdio (in mare)</string>
 	<string name="poi_seamark_light">Lughe (in mare)</string>
 	<string name="poi_seamark_light_major">Lughe manna (in mare)</string>
@@ -569,13 +569,13 @@
 	<string name="poi_seamark_small_craft_facility">Servìtzios pro barcas minores</string>
 	<string name="poi_seamark_topmark">Miràgliu</string>
 	<string name="poi_motor_sport">Isport a motore</string>
-	<string name="poi_carpet_layer">Assentadore de moquette</string>
+	<string name="poi_craft_carpet_layer">Assentadore de moquette</string>
 	<string name="poi_motorway_junction">Illoidura autostradale</string>
 
 	<string name="poi_waterway_turning_point">Furriada de martza pro naviles</string>
 	<string name="poi_customs">Dogana</string>
 	<string name="poi_cannon">Cannone istòricu</string>
-	<string name="poi_ferris_wheel">Roda panoràmica</string>
+	<string name="poi_big_wheel">Roda panoràmica</string>
 	<string name="poi_carousel">Giostra</string>
 	<string name="poi_maze">Labirintu</string>
 	<string name="poi_summer_toboggan">Toboca istivu</string>
@@ -584,7 +584,7 @@
 	<string name="poi_ice_stock">Stock sport (birillos in s\'astra)</string>
 	<string name="poi_attraction_animal">Animales (atràida)</string>
 	<string name="poi_harbour">Portu</string>
-	<string name="poi_agricultural_engines_craft">Motores agrìcolos</string>
+	<string name="poi_craft_agricultural_engines">Motores agrìcolos</string>
 	<string name="poi_hunting_stand">Posta de cassa</string>
 	<string name="poi_waterfall">Istrampu</string>
 	<string name="poi_tower">Turre</string>
@@ -620,10 +620,13 @@
 	<string name="poi_farm">Fatoria: butega</string>
 	<string name="poi_wine">Butega de binos</string>
 
-	<string name="poi_child_clothes_shop">Butega de bestires pro pitzinnos</string>
+	<string name="poi_child_clothes">Butega de bestires pro pitzinnos</string>
 	<string name="poi_car">Cuntzessionàriu de màchinas</string>
 	<string name="poi_car_parts">Cantos de màchinas</string>
 	<string name="poi_public_transport_stop_position">Firmada de su trasportu pùblicu</string>
 	<string name="poi_halt">Firmada de sa ferrovia</string>
 	<string name="poi_railway_buffer_stop">Denegante pro sos trenos</string>
+	<string name="poi_baby_hatch">Bàntzigu pro sa bida/Roda de sos espostos</string>
+	<string name="poi_apartment">Apartamentu</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 84b106beb2..44acf146a2 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
     <string name="misc_pref_title">Mistura</string>
     <string name="localization_pref_title">Localizatzione</string>
@@ -59,8 +60,8 @@
     <string name="keep_and_add_destination_point">Annànghe unu puntu de destinatzione</string>
     <string name="select_gpx">Issèbera GPX…</string>
     <string name="route_descr_select_destination">Issèbera sa destinatzione</string>
-    <string name="shared_string_select_on_map">Ischerta in sa mapa…</string>
-    <string name="shared_string_favorite">Prefèrridu…</string>
+    <string name="shared_string_select_on_map">Ischerta in sa mapa</string>
+    <string name="shared_string_favorite">Prefèrridu</string>
     <string name="route_preferences">Preferèntzias pro s’àndala</string>
     <string name="route_info">Informatziones pro s’àndala</string>
     <string name="routing_attr_prefer_motorway_name">Preferre sas autostradas</string>
@@ -237,7 +238,7 @@
     <string name="plugin_distance_point">Puntu</string>
     <string name="gpx_file_name">Nùmene de su documentu GPX</string>
     <string name="gpx_saved_sucessfully">Documentu GPX sarbadu cun sutzessu in {0}</string>
-    <string name="osmand_distance_planning_plugin_description">Ativat unu widget pro creare àndalas carcande in sa mapa (o impreare/mudare documentos GPX esistentes) pro medire sa distantzia intra \'e puntos diferentes. Sos resurtados podent èssere sarbados comente GPX, e ant a poder\'èssere impreados pro pianificare una caminera GPX.</string>
+    <string name="osmand_distance_planning_plugin_description">Custu plugin ativat unu widget in s\'ischermu de sa mapa chi permitit de creare àndalas carcande in sa mapa, o de impreare o mudare documentos GPX esistentes, pro pianificare unu biàgiu e medire sa distantzia intre puntos diferentes. Sos resurtados podent èssere sarbados comente GPX, e ant a poder\'èssere impreados prus a tardu comente ghia.</string>
     <string name="osmand_distance_planning_plugin_name">Aina calcoladore de distàntzia e pianificatzione</string>
     <string name="use_distance_measurement_help">* Toca pro sinnare unu puntu.\n 
         * Carca e tene carcau in sa mapa pro burrare sos puntos antepostos.\n
@@ -277,7 +278,9 @@
     <string name="monitoring_settings_descr">Cunfigura comente registrare sos biàgios tuos</string>
     <string name="osmo_settings_uuid">ID ùnicu de su dispositivu</string>
     <string name="osmo_settings_descr">Cunfigura sas impostaduras de compidada de su dispositivu e imposta su canale de compidada pessonale</string>
-    <string name="osmo_plugin_description">"Compidada OsMo - Compidada avantzada in dereta, bie http://osmo.mobi. Sighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comunica. Sunt disponìbiles meda impostaduras pro s’arrastamentu, pro sa sessione in cursu o permanentes. Sos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, ad es. non b’est su controllu remotu e nemmancu s’amministradore de su grupu.Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. Pro àteras informatziones: http://osmo.mobi. "</string>
+    <string name="osmo_plugin_description">"Custu plugin frunit sas funtzionalidades pro impreare sa compidada avantzada in dereta, bie http://osmo.mobi.
+\n\nSighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comùnica. Sunt disponìbiles meda impostaduras pro s’arrastamentu, pro sa sessione in cursu o permanentes.
+\n\nSos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, es. non b’est su controllu remotu e nemmancu s’amministradore de su grupu. Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. "</string>
     <string name="osmo_plugin_name">Compidada OsMo</string>
     <string name="osmo_settings">Compidada OsMo</string>
    	
@@ -382,16 +385,18 @@
     <string name="shared_string_control_start">Avia/Inghitza</string>
     <string name="map_widget_av_notes">Notas àudio/vìdeo</string>
     <string name="osmand_srtm_short_description_80_chars">Plugin OsmAndfor pro sas lìnias de livellu sena lìnia</string>
-    <string name="osmand_srtm_long_description_1000_chars">Custu plugin frunidi sas lìnias de livellu chi podent èssere bisualizatas in sas mapas sena lìnia de OsmAnd. Sos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">"Custu plugin frunidi sas lìnias de livellu e sas umbraduras de sos rilievos, chi podent èssere visualizadas in supra de sas mapas non in lìnia de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàggiu.
+\n\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems). "</string>
     <string name="map_widget_distancemeasurement">Medidura de sa distantzia</string>
     <string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione ...\" pro assinzare una nota a sa positzione dislindada</string>
     
     <string name="map_widget_audionotes">Notas àudio</string>
-    <string name="audionotes_plugin_description">Registra notas àudio/vìdeo durante su biàgiu</string>
+    <string name="audionotes_plugin_description">Su plugin pro sas notas àudio/vìdeo frunit sas funtzionalidades pro registrare notas àudio/foto/vìdeo durante su biàgiu, impreande su butone in s\'ischermu de sa mapa o su menù de cuntestu pro calechisiat positzione in sa mapa.</string>
     <string name="audionotes_plugin_name">Plugin notas àudio/vìdeo</string>
     <string name="index_srtm_parts">partes</string>
     <string name="index_srtm_ele">Lìnias de livellu</string>
-    <string name="srtm_plugin_description">Plugin esternu (iscarrigamentu a banda) chi fatzìlitat s’isgarrigamentu de sas lìnias de livellu e s’umbradura de sos rilievos (\'Impostaduras\' → \'Gestione documentos mapa\' → \'Isgarrigamentu\' → Issèbera su tipu de mapa disigiatu). Custos podent èssere ammustrados in cumbinatzione cun sas mapas OsmAnd non in lìnia.</string>
+    <string name="srtm_plugin_description">"Custu plugin frunidi sas lìnias de livellu e sas umbraduras de sos rilievos, chi podent èssere visualizadas in supra de sas mapas non in lìnia de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàggiu.
+\n\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems). "</string>
     <string name="srtm_plugin_name">Plugin lìnias de livellu</string>
     <string name="download_select_map_types">Àteras mapas</string>
     <string name="download_roads_only_item">Petzi istradas</string>
@@ -785,7 +790,7 @@
 	<string name="osmand_parking_pm">PM</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Puntu de parchègiu</string>
-	<string name="osmand_parking_plugin_description">Custu plugin (de iscarrigare a banda) agiùdada ad ammentare su logu de parchègiu de sa màchina tua.</string>
+	<string name="osmand_parking_plugin_description">Custu plugin est istadu isvilupadu pro impreare OsmAnd pro ammentare su logu de parchègiu de sa màchina tua.</string>
 	<string name="osmand_parking_plugin_name">Plugin positzione parchègiu</string>
 	<string name="context_menu_item_add_parking_point">Marca comente positzione de parchègiu</string>
 	<string name="gpxup_public">Pùblicu</string>
@@ -802,7 +807,7 @@
 	<string name="rendering_attr_appMode_name">Modalidade de disinnu</string>
 	<string name="rendering_attr_contourLines_name">Ammustra curvas de livellu</string>
 	<string name="local_index_routing_data">Datos àndala</string>
-	<string name="navigate_point_format">Formatu:</string>
+	<string name="navigate_point_format">Formatu</string>
 	<string name="poi_search_desc">Chirca PDI (puntos de interesse)</string>
 	<string name="address_search_desc">Chirca de sos indiritzos</string>
 	<string name="navpoint_search_desc">Coordinatas</string>
@@ -823,7 +828,7 @@
 	<string name="online_map_settings_descr">Cunfigura sas mitzas de sas mapas in lìnia o de sos tasseddos in cache</string>
 	
 	
-	<string name="osmand_accessibility_description">Ammustra sas impostaduras pro funtzionalidades ispetziales pro s’atzessibilidade.</string>
+	<string name="osmand_accessibility_description">Custu plugin permitit de impreare sas funtzionalidades pro s\'atzessibilidade de su dispositivu detetamente in OsmAnd, e fatzilitat, pro nàrrere, sa modìfica de sa lestresa de sas boghes TTS, sa cunfiguratzione de su movimentu de s\'ischermu, s’impreu de una trackball pro su zoom o de un’interfàtzia vocale.</string>
 	
 	<string name="plugins_screen">Plugins</string>
 	
@@ -977,12 +982,14 @@
 	<string name="first_time_msg">Gratzias pro s’impreu de OsmAnd. Pro meda de sas caraterìsticas de s’àplicu tènes bisongiu de datos locales sena lìnia, chi podent èssere icarrigadas dae \'Impostaduras\'→\'Amministra sos documentos de sas mapas\'. A pustis at a èssere possìbile ammustrare mapas, chircare indirìtzos, PDI, e agatare trasportos pùblicos.</string>    
 	<string name="basemap_was_selected_to_download">Sa mapa de base est netzessària pro su funtzionamentu curretu de s’àplicu e est istada ischertada pro s’iscarrigamentu.</string>
 	
-	<string name="osmand_development_plugin_description">Ammustrat sas impostaduras pro funtzionalidades pro isvilupu e debug comente su nàvigu animadu o s’ammustrare sa prestatzione de su rèndering.</string>
+	<string name="osmand_development_plugin_description">Custu plugin ammustrat sas impostaduras pro funtzionalidades pro isvilupu e debug comente sa simulatzione de su nàvigu, sa visualizatzione de sa prestatzione de su rèndering, o s\'interfàtzia vocale. Custas impostaduras sunt pensadas pro sos isvilupadores e non sunt netzessàrias pro sos àteros impitadores.</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Sas mapas vetoriales diat dèpere apàrrere in manera prus lestra. In carchi dispositivu diat podere funtzionare male.</string>
 	<string name="osmand_parking_warning_text">Pretzdentemente est istada annangada a su tzeravallu/calendàriu tuo sa notìfica pro recuperare sa màchina. At a abarrare finas a cando non l\'as a burrare manualmente.</string>    
 	<string name="rendering_attr_noPolygons_description">Faghe divènnere transparentes totu sas caraterìsticas de sas àreas de su terrinu</string>
 	<string name="rendering_attr_hmRendered_description">Aumenta sa cantidade ammustrada de minujos de sa mapa</string>
-	<string name="osmand_rastermaps_plugin_description">Ammustrat sas impostaduras pro cunfigurare una variedade de mapas in lìnia o a tasseddos in cache comente mapa de base pro sas mapas subrapostas/de sutafondu. Custas mapas podent èssere fintzas ammaniadas sena lìnia e copiadas in sa cartella de sos datos de OsmAnd.</string>
+	<string name="osmand_rastermaps_plugin_description">"Cun custu plugin podes atzèdere a medas castas de màpas in lìnia (cussas connotas comente \"a tasseddos\" o \"raster\"), dae sas predefinidas de  Openstreetmap (comente Mapnik) a sas immàgines satellitares e a sos istratos pro punnas ispetziales comente sas mapas metereològicas, climàticas, geològicas, e umbradura de sos rilievos etc.
+\n\nTotu custas mapas podent èssere impreadas siat comente mapa printzipale (de base) de ammustrare in s\'ischermada mapa de OsmAnd siat comente un\'istratu se subrapositzione o de isfundu de un’àtera mapa de base (comente sas mapas standard non in lìnia de OsmAnd). Pro permìtere una visibilidade prus manna de sas mapas de isfundu, calicunu de sos elementos de sas mapas vetoriales podet èssere cuadu, impreande su menù \'Cunfigura sa mapa\' sighinde sas netzessidades tuas.
+\n\nSas mapas a tasseddos podent èssere iscarrigadas deretamente o ammaniadas pro s\'impreu sena lìnia (e a pustis copiadas intre sa cartella de sos datos de OsmAnd) comente unu database sqlite chi podet èssere produidu dae medas ainas pro sa creatzione de mapas esternas (third-party maps). "</string>
 	
 	<string name="tip_recent_changes_0_8_0_t">"Mudas in sa 0.8.0:
 \n\t- *Funtzionalidade a plugin*
@@ -993,7 +1000,7 @@
 \n\t- *Càlculu de s’àndala sena lìnia*
 \n\t - Su càlculu de sas àndala divènnidi prus sòlidu\n\t *Megioramentos impreabilidade e UI*
 \n\t - Megioramentos in medas àreas "</string>
-	<string name="osm_editing_plugin_description">Ammustrat sas impostaduras netzessàrias pro cuntribuire ad OSM comente sa creatzione e sa muda de sos PDI de OSM, apèrrere e cummentare errores de OSM e imbiare documentos GPX registrados (netzessitat de sas credentziales de OSM).</string>
+	<string name="osm_editing_plugin_description">Custu plugin permitit de cuntribuire ad OSM creande e modificande sos PDI de OSM, aberinde e cummentande errores de OSM e imbiande documentos GPX registrados. OSM est unu progetu pùblicu de mapadura fatu dae una comunidade globale. Pro àteras informatziones: http://openstreetmap.org. Sa partetzipatzione est apretziada, e sas cuntributziones podent èssere fatas deretamente dae OsmAnd insertande in intro de s\'aplicu sas credentziales de atzessu.</string>
 	<string name="play_commands_of_currently_selected_voice">Riprodui sos cumandos de sa boghe como seletzionada</string>
 	<string name="test_voice_prompts">Proa sos cumandos vocales</string>    
 	<string name="switch_to_raster_map_to_see">Peruna mapa vetoriale est disponìbile pro custa positzione. Ne podes iscarrigare una in Impostaduras (Amministra sos documentos de sas mapas), o colare a sas mapas in lìnia (abìlita sas mapas in lìnia pro lu fàghere).</string>
@@ -1151,7 +1158,7 @@
 	<string name="vector_map_not_needed">No, gràtzias</string>
 	<string name="basemap_missing">Fartat sa mapa de base de su mundu (totu su mundu pro zoom bassos). Podes iscarrigare World_basemap_x.obf pro unu sistema cumpridu.</string>
 	<string name="vector_data_missing">Fartant sos datos (\'non in lìnia\') in s’ischeda SD. Ti cussigiamus de los iscarrigare pro poder impreare sas mapas sena lìnia.</string>
-	<string name="local_index_installed">Editzione</string>
+	<string name="local_index_installed">Versione locale</string>
 	<string name="local_index_items_backuped">%1$d de %2$d ogetu/os deativados curretamente.</string>
 	<string name="local_index_items_deleted">%1$d de %2$d ogetu/os burradu curretamente.</string>
 	<string name="local_index_items_restored">%1$d de %2$d ogetu/os ativadu/os curretamente.</string>
@@ -1380,7 +1387,7 @@
 	<string name="old_map_index_is_not_supported">Su formadu datos mapa \'\'{0}\'\' est isputziau e no est suportadu</string>
 	<string name="osmand_routing_experimental">"Su nàvigu sena lìnia de OsmAnd est isperimentale e non funtzionada pro distàntzias prus mannas de  20 km.\n\nSu servìtziu de nàvigu benit furnidu intertantu tramite CloudMade in lìnia."</string>
 	<string name="osmand_net_previously_installed">B’est installada una versione pretzedente de OsmAnd. Totu sos datos ant a èssere suportados dae s’aplicu nou. Sos prefèrridos depent èssere esportados dae s’aplicu bètzu e importados a manuda in su nou.</string>
-	<string name="gps_status_app_not_found">Aplicu istadu GPS no installada. La boles chircare in su Market?</string>
+	<string name="gps_status_app_not_found">Aplicu istadu GPS no installadu. Lu boles chircare in su Market?</string>
 	<string name="voice_is_not_available_msg">Boghe de ghia non disponìbile. Intra in \'Impostaduras\' → \'Impostaduras generales\' → \'Ghia vocale\', issèbera su pachete prefèrridu e/o iscàrrigalu.</string>
 	<string name="daynight_descr">Issèbera sas règulas pro sa muda de sa modalidade die/note</string>
 	<string name="download_files_question">Iscarrigare {0} documentu/os ({1} MB)?</string>
@@ -1469,7 +1476,7 @@
 	<string name="search_online_address">Ìnternet</string>
 	<string name="max_level_download_tile">Max zoom in lìnia</string>
 	<string name="max_level_download_tile_descr">Issèbera su livellu màssimu da iscarrigare pro sa mapas in lìnia a tasseddos</string>
-	<string name="route_general_information">Distàntzia totale %1$s \n durada de su biàgiu %2$d h %3$d m.</string>
+	<string name="route_general_information">Distàntzia totale %1$s, longària de su biàgiu %2$d h %3$d m.</string>
 	<string name="router_service_descr">Issèbera unu servìtziu in lìnia o sena lìnia de nàvigu</string>
 	<string name="router_service">Servìtziu de nàvigu</string>
 	<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s’ischeda SD no est atzessiva!</string>
@@ -1478,7 +1485,7 @@
 	<string name="address">Indiritzu</string>
 	<string name="shared_string_download_successful">Iscarrigamentu cumpridu</string>
 	
-	<string name="shared_string_downloading">Iscarrigande …</string>
+	<string name="shared_string_downloading">Iscarrigande</string>
 	
 	<string name="downloading_list_indexes">Iscarrigamentu lista regiones disponìbiles…</string>
 	<string name="list_index_files_was_not_loaded">Sos documentos inditze non sunt istados agatados in osmand.net.</string>
@@ -1708,7 +1715,8 @@
     <string name="speak_poi">Annùntzia PDI a curtzu</string>
     <string name="flat_list_waypoints">Totus</string>
     <string name="index_tours">Itineràrios</string>
-    <string name="record_plugin_description">Ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s’ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
+    <string name="record_plugin_description">"Custu plugin ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s’ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.
+\n\nSas rastas registradas podent èssere cumpartzida cun sos amigos tuos o èssere impreadas pro cuntribuire a OSM. Sos atletas podent impreare sas rastas pro compidare sos allenamentos issoro. Carchi anàlisi de base podet èssere fata deretamente in OsmAnd, comente tempus de giru, lestresa mèdia etc., e sas rastas podent, est craru, èssere analizadas fintzas prus a tardu cun ainas estèrnas de anàlisi. "</string>
     <string name="record_plugin_name">Registratzione biàgios</string>
     <string name="int_hour">h</string>
     <string name="duration">Durada</string>
@@ -1867,11 +1875,12 @@
 		\n\nEst disponìbile una mapa cun totu sas pistas e sas àndalas pro iscì de fundu suta de \'Iscarrigàbiles\', comente \'World ski map\'.
 		\n\nCusta vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\'.
 	</string>
-	<string name="plugin_touringview_descr">Ativande custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.
-		\n\nCusta vista frunit, pro cada livellu de zoom, su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu). Rapresentat fintzas totu sas castas de istrada in manera crara tramite colores diferentes, agiudande meda, pro nàrrere, sos chi ghiant veìculos mannos meda.
-		\n\nNo est netzessària una mapa ispetziale, sa vista est creada dae sas mapas istandard.
-		\n\nCusta vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\' comente boles.
-	</string>
+	<string name="plugin_touringview_descr">"Ativande custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.
+\n\nCusta vista frunit, pro cada livellu de zoom, su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu).
+\n\nRapresentat fintzas totu sas castas de istrada in manera crara tramite colores diferentes, agiudande meda, pro nàrrere, sos chi ghiant veìculos mannos meda.
+\n\nE frunit optziones ispetziales de nàvigu, comente sa visualizatzione de sas àndalas pro sas bitzicletas e s\'alpinismu.
+\n\nNo est netzessàriu iscarrigare una mapa ispetziale, sa vista est creada dae sas mapas istandard.
+\n\nCusta vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\' comente boles. "</string>
 	
 	<string name="showed_on_map">Ammustradu in sa mapa</string>
 	<string name="days_behind">dies faghet</string>
@@ -1884,4 +1893,28 @@
 <string name="shared_string_selected">Ischertadu</string>
 	<string name="track_segments">Segmentos de sa rasta</string>
 	<string name="track_points">Puntos de sa rasta</string>
-	</resources>
\ No newline at end of file
+	<string name="action_create">Atzione crea</string>
+	<string name="action_modify">Atzione modìfica</string>
+	<string name="action_delete">Atzione burra</string>
+	<string name="osm_edits">Modìficas OSM</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Galu</string> <string name="parking_place_limited">Parchègiu cun tempus limitadu</string>
+	<string name="your_edits">Modìficas tuas</string>
+    <string name="waypoint_visit_after">Vìsita a pustis</string>
+    <string name="waypoint_visit_before">Vìsita in antis</string>
+    <string name="simulate_your_location">Dispinta/Sìmula sa positzione tua</string>
+    <string name="drawer">Lista ebbia</string>
+    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
+    <string name="tips_and_tricks_descr">Dimandas fitianas, ùrtimas modìficas e àteru</string>
+    <string name="routing_settings_2">Impostaduras de nàvigu</string>
+    <string name="general_settings_2">Impostaduras generales</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_deselect">De-ischerta</string>
+	<string name="shared_string_deselect_all">De-ischerta totu</string>
+	<string name="shared_string_unexpected_error">B\'est istadu unu errore non prevididu</string>
+	<string name="shared_string_action_template">Atzione {0}</string>
+	<string name="shared_string_collapse">Mìnima</string>
+	<string name="shared_string_video">Vìdeo</string>
+	<string name="shared_string_photo">Foto</string>
+	<string name="route_points">Puntos de s\'àndala</string>
+	<string name="shared_string_release">Essidu</string>
+	</resources>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index f2150a3f21..29fb6d545d 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -39,76 +39,76 @@
 	<string name="poi_vending_machine">Predajný automat</string>
 	<string name="poi_wine">Vinotéka</string>
 
-	<string name="poi_bookshop">Kníhkupectvo</string>
-	<string name="poi_bicycle_shop">Bicykle</string>
-	<string name="poi_anime_shop">Japonské anime</string>
-	<string name="poi_antiques_shop">Starožitnosti</string>
-	<string name="poi_art_shop">Umelecké predmety</string>
+	<string name="poi_books">Kníhkupectvo</string>
+	<string name="poi_bicycle">Bicykle</string>
+	<string name="poi_anime">Japonské anime</string>
+	<string name="poi_antiques">Starožitnosti</string>
+	<string name="poi_art">Umelecké predmety</string>
 	<string name="poi_baby_goods">Potreby pre bábätká</string>
-	<string name="poi_bag_shop">Kabelky/Tašky</string>
-	<string name="poi_bathroom_furnishing_shop">Vybavenie kúpeľňe</string>
-	<string name="poi_bed_shop">Vybavenie spálne</string>
+	<string name="poi_bag">Kabelky/Tašky</string>
+	<string name="poi_bathroom_furnishing">Vybavenie kúpeľňe</string>
+	<string name="poi_bed">Vybavenie spálne</string>
 	<string name="poi_boutique">Butik</string>
-	<string name="poi_carpet_shop">Koberce</string>
-	<string name="poi_chemist_shop">Drogéria</string>
-	<string name="poi_clothes_shop">Oblečenie/Konfekcia</string>
-	<string name="poi_child_clothes_shop">Detské oblečenie</string>
+	<string name="poi_carpet">Koberce</string>
+	<string name="poi_chemist">Drogéria</string>
+	<string name="poi_clothes">Oblečenie/Konfekcia</string>
+	<string name="poi_child_clothes">Detské oblečenie</string>
 	<string name="poi_shoes">Obuv</string>
-	<string name="poi_computer_shop">Počítače</string>
+	<string name="poi_computer">Počítače</string>
 	<string name="poi_copyshop">Kopírovanie</string>
-	<string name="poi_curtain_shop">Závesy</string>
-	<string name="poi_fabric_shop">Látky</string>
-	<string name="poi_bedding_shop">Posteľné prádlo</string>
-	<string name="poi_dive_shop">Potápačské vybavenie</string>
-	<string name="poi_doityourself_shop">Pre domácich kutilov</string>
-	<string name="poi_erotic_shop">Sexshop</string>
-	<string name="poi_fishing_shop">Rybárske potreby</string>
+	<string name="poi_curtain">Závesy</string>
+	<string name="poi_fabric">Látky</string>
+	<string name="poi_bedding">Posteľné prádlo</string>
+	<string name="poi_dive">Potápačské vybavenie</string>
+	<string name="poi_doityourself">Pre domácich kutilov</string>
+	<string name="poi_erotic">Sexshop</string>
+	<string name="poi_fishing">Rybárske potreby</string>
 	<string name="poi_florist">Kvetinárstvo</string>
-	<string name="poi_frame_shop">Rámy na obrazy</string>
-	<string name="poi_furniture_shop">Nábytok</string>
+	<string name="poi_frame">Rámy na obrazy</string>
+	<string name="poi_furniture">Nábytok</string>
 	<string name="poi_garden_centre">Záhradnícke centrum</string>
-	<string name="poi_gas_shop">Skvapalnené plyny</string>
+	<string name="poi_gas">Skvapalnené plyny</string>
 	<string name="poi_general">Zmiešaný tovar</string>
-	<string name="poi_gift_shop">Suveníry/darčeky</string>
-	<string name="poi_glaziery_shop">Sklenárstvo</string>
-	<string name="poi_hardware_shop">Železiarstvo</string>
-	<string name="poi_hearing_aids_shop">Sluchové pomôcky</string>
+	<string name="poi_gift">Suveníry/darčeky</string>
+	<string name="poi_glaziery">Sklenárstvo</string>
+	<string name="poi_hardware">Železiarstvo</string>
+	<string name="poi_hearing_aids">Sluchové pomôcky</string>
 	<string name="poi_herbalist">Bylinkárstvo</string>
-	<string name="poi_hifi_shop">Hi-Fi prístroje</string>
-	<string name="poi_houseware_shop">Potreby pre domácnosť</string>
-	<string name="poi_hunting_shop">Lovecké potreby</string>
-	<string name="poi_interior_decoration_shop">Domáce ozdoby</string>
-	<string name="poi_jewelry_shop">Klenotníctvo</string>
+	<string name="poi_hifi">Hi-Fi prístroje</string>
+	<string name="poi_houseware">Potreby pre domácnosť</string>
+	<string name="poi_hunting">Lovecké potreby</string>
+	<string name="poi_interior_decoration">Domáce ozdoby</string>
+	<string name="poi_jewelry">Klenotníctvo</string>
 	<string name="poi_kiosk">Novinový stánok</string>
-	<string name="poi_kitchen_shop">Kuchynské štúdio</string>
-	<string name="poi_mobile_phone_shop">Mobilné telefóny</string>
-	<string name="poi_motorcycle_shop">Motocykle</string>
-	<string name="poi_musical_instrument_shop">Hudobné nástroje</string>
-	<string name="poi_newsagent_shop">Novinový obchod</string>
+	<string name="poi_kitchen">Kuchynské štúdio</string>
+	<string name="poi_mobile_phone">Mobilné telefóny</string>
+	<string name="poi_motorcycle">Motocykle</string>
+	<string name="poi_musical_instrument">Hudobné nástroje</string>
+	<string name="poi_newsagent">Novinový obchod</string>
 	<string name="poi_optician_shop">Očná optika</string>
-	<string name="poi_organic_shop">Zdravá výživa</string>
-	<string name="poi_outdoor_shop">Turistický obchod</string>
-	<string name="poi_paint_shop">Farby-laky</string>
-	<string name="poi_pet_shop">Domáce zvieratá</string>
-	<string name="poi_radiotechnics_shop">Elektronické komponenty a drobnosti</string>
+	<string name="poi_organic">Zdravá výživa</string>
+	<string name="poi_outdoor">Turistický obchod</string>
+	<string name="poi_paint">Farby-laky</string>
+	<string name="poi_pet">Domáce zvieratá</string>
+	<string name="poi_radiotechnics">Elektronické komponenty a drobnosti</string>
 	<string name="poi_second_hand">Z druhej ruky</string>
 	<string name="poi_ship_chandler">Tovar pre lode</string>
-	<string name="poi_sports_shop">Športové potreby</string>
-	<string name="poi_stationery_shop">Papiernictvo</string>
-	<string name="poi_ticket_shop">Vstupenky</string>
-	<string name="poi_tobacco_shop">Tabak</string>
-	<string name="poi_toys_shop">Hračkárstvo</string>
-	<string name="poi_trade_shop">Pracovný materiál</string>
-	<string name="poi_vacuum_cleaner_shop">Vysávače</string>
+	<string name="poi_sports">Športové potreby</string>
+	<string name="poi_stationery">Papiernictvo</string>
+	<string name="poi_ticket">Vstupenky</string>
+	<string name="poi_tobacco">Tabak</string>
+	<string name="poi_toys">Hračkárstvo</string>
+	<string name="poi_trade">Pracovný materiál</string>
+	<string name="poi_vacuum_cleaner">Vysávače</string>
 	<string name="poi_variety_store">Rozličný tovar</string>
-	<string name="poi_video_shop">Videotéka</string>
-	<string name="poi_window_blind_shop">Žalúzie</string>
+	<string name="poi_video">Videotéka</string>
+	<string name="poi_window_blind">Žalúzie</string>
 	<string name="poi_department_store">Obchodný dom</string>
-	<string name="poi_electronics_shop">Elektro</string>
+	<string name="poi_electronics">Elektro</string>
 	<string name="poi_car">Automobily</string>
 	<string name="poi_car_parts">Autodiely</string>
-	<string name="poi_atv_shop">Terénne štvorkolky</string>
-	<string name="poi_cosmetics_shop">Kozmetika</string>
+	<string name="poi_atv">Terénne štvorkolky</string>
+	<string name="poi_cosmetics">Kozmetika</string>
 	<string name="poi_marketplace">Tržnica</string>
 	<string name="poi_police">Polícia</string>
 	<string name="poi_fire_station">Požiarna stanica</string>
@@ -158,7 +158,7 @@
 	<string name="poi_railway_platform">Železničné nástupište</string>
 	<string name="poi_halt">Železničná zastávka</string>
 	<string name="poi_bus_station">Autobusová stanica</string>
-	<string name="poi_subway_entrance">Vchod do metra</string>
+	<string name="poi_railway_subway_entrance">Vchod do metra</string>
 	<string name="poi_subway_station">Stanica metra</string>
 	<string name="poi_railway_buffer_stop">Železničná zarážka</string>
 	<string name="poi_taxi">Stanovište taxíkov</string>
@@ -254,7 +254,7 @@
 	<string name="poi_prison">Väzenie</string>
 	<string name="poi_embassy">Veľvyslanectvo</string>
 	<string name="poi_government">Vládne orgány</string>
-	<string name="poi_administrative_office">Lokálne úrady</string>
+	<string name="poi_office_administrative">Lokálne úrady</string>
 	<string name="poi_customs">Colná správa</string>
 	<string name="poi_city">Mesto nad 100 tis.obyv.</string>
 	<string name="poi_town">Mesto 10 tis.-100 tis.obyv.</string>
@@ -289,14 +289,14 @@
 	<string name="poi_insurance">Poisťovňa</string>
 	<string name="poi_estate_agent">Realitná kancelária</string>
 	<string name="poi_lawyer">Právnik</string>
-	<string name="poi_telecommunication_office">Telekomunikácie</string>
+	<string name="poi_office_telecommunication">Telekomunikácie</string>
 	<string name="poi_ngo">Nezisková organizácia</string>
 	<string name="poi_town_hall">Radnica</string>
 	<string name="poi_employment_agency">Personálna agentúra</string>
-	<string name="poi_research_office">Výskumný ústav</string>
-	<string name="poi_it_office">Informačné technológie</string>
-	<string name="poi_newspaper_office">Redakcia novín</string>
-	<string name="poi_architect_office">Architektonická kancelária</string>
+	<string name="poi_research">Výskumný ústav</string>
+	<string name="poi_it">Informačné technológie</string>
+	<string name="poi_newspaper">Redakcia novín</string>
+	<string name="poi_architect">Architektonická kancelária</string>
 	<string name="poi_advertising_agency">Reklamná agentúra</string>
 	<string name="poi_educational_institution">Vzdelávacia inštitúcia</string>
 	<string name="poi_studio">Nahrávacie štúdio</string>
@@ -323,11 +323,11 @@
 	<string name="poi_city_gate">Mestská brána</string>
 	<string name="poi_fort">Pevnosť</string>
 	<string name="poi_fountain">Fontána</string>
-	<string name="poi_ruins_historic">Ruina</string>
+	<string name="poi_historic_ruins">Ruina</string>
 	<string name="poi_rune_stone">Kameň s runami</string>
 	<string name="poi_wreck">Vrak lode</string>
-	<string name="poi_ship_historic">Historická loď</string>
-	<string name="poi_mine_historic">Historická baňa</string>
+	<string name="poi_historic_ship">Historická loď</string>
+	<string name="poi_historic_mine">Historická baňa</string>
 	<string name="poi_monument">Pamätník</string>
 	<string name="poi_zoo">Zoologická záhrada</string>
 	<string name="poi_aquarium">Akvárium</string>
@@ -336,7 +336,7 @@
 	<string name="poi_attraction">Turistická atrakcia</string>
 	<string name="poi_amusement_ride">Zábavná jazda</string>
 	<string name="poi_attraction_animal">Zviera</string>
-	<string name="poi_ferris_wheel">Ruské kolo</string>
+	<string name="poi_big_wheel">Ruské kolo</string>
 	<string name="poi_carousel">Kolotoč</string>
 	<string name="poi_maze">Bludisko</string>
 	<string name="poi_roller_coaster">Horská dráha</string>
@@ -354,14 +354,14 @@
 	<string name="poi_apartment">Apartmány</string>
 
 	<string name="poi_place_of_worship">Náboženské miesto</string>
-	<string name="poi_place_of_worship_christian">Náboženské miesto: kresťanské</string>
-	<string name="poi_place_of_worship_jewish">Náboženské miesto: židovské</string>
-	<string name="poi_place_of_worship_muslim">Náboženské miesto: moslimské</string>
-	<string name="poi_place_of_worship_sikh">Náboženské miesto: sikhovia</string>
-	<string name="poi_place_of_worship_buddhist">Náboženské miesto: budhistické</string>
-	<string name="poi_place_of_worship_hindu">Náboženské miesto: hinduistické</string>
-	<string name="poi_place_of_worship_shinto">Náboženské miesto: šintoistické</string>
-	<string name="poi_place_of_worship_taoist">Náboženské miesto: taoistické</string>
+	<string name="poi_religion_christian">Náboženské miesto: kresťanské</string>
+	<string name="poi_religion_jewish">Náboženské miesto: židovské</string>
+	<string name="poi_religion_muslim">Náboženské miesto: moslimské</string>
+	<string name="poi_religion_sikh">Náboženské miesto: sikhovia</string>
+	<string name="poi_religion_buddhist">Náboženské miesto: budhistické</string>
+	<string name="poi_religion_hindu">Náboženské miesto: hinduistické</string>
+	<string name="poi_religion_shinto">Náboženské miesto: šintoistické</string>
+	<string name="poi_religion_taoist">Náboženské miesto: taoistické</string>
 
 	<string name="poi_internet_access_wlan">Internetové pripojenie: Wifi</string>
 	<string name="poi_internet_access_terminal">Internetové pripojenie: terminál</string>
@@ -373,7 +373,7 @@
 	<string name="poi_historic_monastery">Historický kláštor</string>
 	<string name="poi_wayside_cross">Božie muky</string>
 	<string name="poi_wayside_shrine">Malá kaplnka pri ceste</string>
-	<string name="poi_tourism_information">Turistické informácie</string>
+	<string name="poi_information">Turistické informácie</string>
 	<string name="poi_clock">Hodiny</string>
 	<string name="poi_travel_agent">Cestovná kancelária</string>
 	<string name="poi_viewpoint">Rozhľadňa/vyhliadka</string>
@@ -427,7 +427,7 @@
 	<string name="poi_stripclub">Striptízový klub</string>
 	<string name="poi_beach_resort">Plážový areál</string>
 	<string name="poi_dog_park">Výbeh pre psy</string>
-	<string name="poi_fishing_place">Miesto na rybolov</string>
+	<string name="poi_leisure_fishing">Miesto na rybolov</string>
 	<string name="poi_hunting_stand">Poľovnícky posed</string>
 	<string name="poi_harbour">Prístav</string>
 	<string name="poi_marina">Prístav pre jachty</string>
@@ -448,7 +448,7 @@
 	<string name="poi_barbecue">Grilovacie miesto</string>
 
 	<string name="poi_funeral_directors">Pohrebníctvo</string>
-	<string name="poi_beauty_salon">Salón krásy</string>
+	<string name="poi_beauty">Salón krásy</string>
 	<string name="poi_beauty_salon_nails">Nechtové štúdio</string>
 	<string name="poi_hairdresser">Kaderníctvo/holičstvo</string>
 	<string name="poi_massage">Masážny salón</string>
@@ -472,7 +472,7 @@
 	<string name="poi_pawnbroker">Záložňa</string>
 	<string name="poi_currencyexchange">Zmenáreň</string>
 	<string name="poi_accountant">Účtovník</string>
-	<string name="poi_bitcoin_yes">Platba cez bitcoin</string>
+	<string name="poi_bitcoin">Platba cez bitcoin</string>
 
 	<string name="poi_cave_entrance">Vstup do jaskyne</string>
 	<string name="poi_peak">Vrchol</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index db682ffca5..99ac900973 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2014,11 +2014,11 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 		\n\nMapový súbor obsahujúci všetky lyžiarske svahy a bežecké trate je dostupný na stiahnutie pod názvom \"Svetová lyžiarska mapa\".
 		\n\nTento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\".
 	</string>
-	<string name="plugin_touringview_descr">Aktivovaním tohto pohľadu sa zmení štýl mapy na \"Touring view\", ktorý obsahuje viac detailov pre cestovateľov a profesionálnych vodičov.
-		\n\nTento pohľad poskytuje vo všetkých priblíženiach mapy maximum cestovných detailov (napr. cesty, chodníky a orientačné značky). Taktiež zobrazuje typy ciest v jednoznačne odlišných farbách, čo je užitočné napríklad pre veľké vozidlá.
-		\n\nNie je potrebné stiahnuť samostatný súbor, tento pohľad používa štandardné mapové súbory.
-		\n\nTento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\".
-	</string>
+	<string name="plugin_touringview_descr">"Aktivovaním tohto pohľadu sa zmení štýl mapy na \"Touring view\", ktorý obsahuje viac detailov pre cestovateľov a profesionálnych vodičov.
+\n\nTento pohľad poskytuje vo všetkých priblíženiach mapy maximum cestovných detailov (napr. cesty, chodníky a orientačné značky).
+\n\nTaktiež zobrazuje typy ciest v jednoznačne odlišných farbách, čo je užitočné napríklad pre veľké vozidlá.
+\n\nPoskytuje aj špeciálne možnosti pre cestovanie ako cyklotrasy a turistické značkované chodníky.\n\nNie je potrebné stiahnuť samostatný súbor, tento pohľad používa štandardné mapové súbory.
+\n\nTento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\". "</string>
 	<string name="plugin_touringview_name">Cestovný mapový pohľad (Touring view)</string>
 	<string name="location_on_map">Umiestnenie:\n Šírka %1$s\n Dĺžka %2$s</string>
 	<string name="watch">Zobraziť</string>
diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml
index 20f66e9328..0a5af0b2cf 100644
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@@ -14,7 +14,7 @@
 	<string name="poi_osmwiki">Wikipedija</string>
 	<string name="poi_palaeontological_site">Paleontološko nahajališče</string>
 
-	<string name="poi_chemist_shop">Drogerija</string>
+	<string name="poi_chemist">Drogerija</string>
 	<string name="poi_shop">Trgovina</string>
 	<string name="poi_emergency">Nujna pomoč</string>
 	<string name="poi_education">Izobraževanje</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index ffd543d7a9..4824dcfdc1 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="search_button">Iskanje</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="search_button">Iskanje</string>
 	<string name="search_activity">Iskanje</string>
 	
 	
@@ -378,7 +379,7 @@
 	<string name="rendering_attr_contourLines_description">Prikaži pod povečavo (potrebuje datoteko SRTM):</string>
 	<string name="rendering_attr_hmRendered_description">Povečaj število podrobnosti karte</string>
 	<string name="rendering_attr_hmRendered_name">Pokaži podrobnejšo karto</string>
-	<string name="navigate_point_format">Oblika:</string>
+	<string name="navigate_point_format">Oblika</string>
 	<string name="day_night_info">Informacije dan/noč</string>
 	<string name="map_widget_day_night">Zemljevid dan/noč</string>
 	<string name="map_widget_vector_attributes">Lastnosti upodabljanja</string>
@@ -401,8 +402,8 @@
 	<string name="osmand_parking_position_description">Položaj vašega parkiranega avtomobila: %1$s</string>
 	<string name="osmand_parking_position_description_add">Prevzem avtomobila ob:</string>
 	<string name="osmand_parking_position_name">Točka parkiranja</string>
-	<string name="osmand_parking_plugin_description">Ta vtičnik omogoča shranjevanje mesta vašega parkiranega avtomobila.</string>
-	<string name="osmand_parking_plugin_name">Vtičnik za parkirni položaj</string>
+	<string name="osmand_parking_plugin_description">Ta vtičnik omogoča enostavno shranjevanje mesta parkiranja vašega avtomobila v OsmAnd.</string>
+	<string name="osmand_parking_plugin_name">Parkirni položaj</string>
 	<string name="context_menu_item_add_parking_point">Označi kot parkirni položaj</string>
 	<string name="context_menu_item_delete_parking_point">Brisanje oznake parkiranja</string>
 	<string name="local_index_routing_data">Podatki usmerjanja</string>
@@ -438,7 +439,7 @@
 	<string name="local_index_gpx_info_show">\n\nDolg pritisk za možnosti</string>
 	<string name="search_offline_clear_search">Novo iskanje</string>
 	<string name="poi_filter_custom_filter">Filter po meri</string>
-	<string name="gps_status_app_not_found">Aplikacija GPS Status ni nameščena. Ali jo želite poiskati v Google Play trgovini?</string>
+	<string name="gps_status_app_not_found">Aplikacija GPS status ni nameščena. Ali jo želite poiskati v Google Play trgovini?</string>
 	<string name="show_point_options">Uporabi mesto …</string>
 	<string name="menu_layers">Sloji zemljevida</string>
 	<string name="where_am_i">Kje sem?</string>
@@ -454,7 +455,7 @@
 	<string name="prefs_plugins_descr">Vtičniki omogočajo napredne nastavitve in dodatne funkcionalnosti</string>
 	<string name="osmand_development_plugin_description">Prikaži nastavitve za razvoj in razhroščevanje, kot so animirana navigacija ali prikaz hitrosti izrisa.</string>
 	
-	<string name="osmand_accessibility_description">Prikaz nastavitve za posebne funkcije dostopnosti.</string>
+	<string name="osmand_accessibility_description">Prikaz nastavitev za aktivacijo posebnih funkcij dostopnosti.</string>
 	<string name="osmand_background_plugin_description">Prikaži nastavitve za sledenje in navigacijo v načinu spanja (ugasnjen ekran in občasna uporaba GPS-a).</string>
 	<string name="shared_string_close">Zapri</string>
 	<string name="opening_hours">Delovni čas</string>
@@ -613,7 +614,7 @@
 	<string name="map_online_data_descr">Uporabi spletne zemljevide (prejem in predpomnjenje ploščic na kartici SD)</string>
 	<string name="online_map_settings">Spletni zemljevidi</string>
 	<string name="online_map_settings_descr">Nastavitev virov spletnih zemljevidov ali predpomnjenih ploščic</string>
-	<string name="osmand_rastermaps_plugin_description">Pokaži nastaviteve za nastavitev različnih spletnih ali predpomnjenih ploščic zemljevidov kot osnovni zemljevid ali zgornje / spodnje plasti. Te zemljevide lahko pripravite, tudi ko niste povezani, in jih kopirate v mapo OsmAnd.</string>
+	<string name="osmand_rastermaps_plugin_description">"Pokaži nastavitve za nastavitev različnih spletnih ali predpomnjenih ploščic zemljevidov kot osnovni zemljevid ali zgornje / spodnje plasti. Te zemljevide lahko pripravite, tudi ko niste povezani, in jih kopirate v mapo OsmAnd. "</string>
 	<string name="osm_editing_plugin_description">Pokaži nastavitve, ki so zahtevane za povratne informacije OSM kot so zbiranje/spreminjanje predmetov POI OSM, odpiranje/komentiranje hroščev OSM in prispevanje posnetih sledi GPX (zahteva poverila OSM).</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vektorski zemljevidi se bodo verjetno prikazali hitreje. Morda na nekaterih napravah ne bodo dobro delovali.</string>
 	<string name="debugging_and_development">Razvoj OsmAnd</string>
@@ -777,7 +778,7 @@
 	<string name="vector_map_not_needed">Ne, hvala</string>
 	<string name="basemap_missing">Osnovni zemljevid sveta (ki pokriva cel svet pri majhnih povečavah) manjka. Razmislite o prejemu World_basemap_x.obf za celotno okolje.</string>
 	<string name="vector_data_missing">Nepovezani podatki manjkajo na SD kartici. Razmislite o njihovem prejemu, da boste lahko zemljevide uporabili tudi, ko ste nepovezani.</string>
-	<string name="local_index_installed">Izdaja</string>
+	<string name="local_index_installed">Lokalna izdaja</string>
 	<string name="map_text_size_descr">Izberite velikost besedila za imena na zemljevidu</string>
 	<string name="map_text_size">Velikost pisave zemljevida</string>
 	<string name="trace_rendering">Podatki razhroščevanja upodabljanja</string>
@@ -986,7 +987,7 @@
 	<string name="search_online_address">Iskanje v povezavi</string>
 	<string name="max_level_download_tile">Maks. povečava za spletne</string>
 	<string name="max_level_download_tile_descr">Izbira najvišje stopnje povečave za prenos spletnih zemljevidov</string>
-	<string name="route_general_information">Skupna razdalja %1$s \n čas potovanja %2$d u %3$d m.</string>
+	<string name="route_general_information">Skupna razdalja %1$s, čas potovanja %2$d u %3$d m.</string>
 	<string name="router_service_descr">Izbira spletne ali krajevne navigacijske storitve</string>
 	<string name="sd_dir_not_accessible">Shranjevalnega imenika na SD kartici ni na voljo!</string>
 	<string name="download_question">Prenesti {0} - {1}?</string>
@@ -1111,7 +1112,7 @@
     <string name="osmodroid_plugin_name">Vtičnik OsMoDroid</string>
 	<string name="index_srtm_ele">Izohipse</string>
     <string name="srtm_plugin_description">Omogoča prenos izohips in senčenja hribov za uporabo brez povezave (\'Nastavitve\' → \'Upravljanje datotek zemljevidov\' → \'Prenos\' → Izbira vrste mape).</string>
-    <string name="srtm_plugin_name">Vtičnik Izohipse</string>
+    <string name="srtm_plugin_name">Izohipse</string>
     <string name="download_select_map_types">Drugi zemljevidi</string>
     <string name="recording_context_menu_play">Predvajaj</string>
     <string name="recording_description">Snemanje %1$s %3$s %2$s</string>
@@ -1124,7 +1125,7 @@
     <string name="map_widget_distancemeasurement">Merjenje razdalj</string>
     
     <string name="map_widget_audionotes">Zvočni zapisi</string>
-    <string name="audionotes_plugin_description">Shrani zvočne zapise med potovanjem</string>
+    <string name="audionotes_plugin_description">Ta vtičnik omogoča snemanje avdio, fotografskih in video opomb med potovanjem</string>
     <string name="audionotes_plugin_name">Vtičnik za zvočne zapise</string>
     <string name="index_srtm_parts">deli</string>
     <string name="download_srtm_maps">Podatki izohips</string>
@@ -1267,7 +1268,7 @@
 \n\t* Podpora OSM opomb "</string>
     <string name="intermediate_items_sort_by_distance">Razvrščanje (od vrat do vrat)</string>
     <string name="osmand_distance_planning_plugin_description">Ustvarite poti (ali uporabite/spremenite obstoječe GPX datoteke) za merjenje razdalj med točkami. Shrani kot GPX se lahko uporabi za načrtovanje GPX poti.</string>
-    <string name="osmand_distance_planning_plugin_name">Računanje razdalj in Orodje za načrtovanje</string>
+    <string name="osmand_distance_planning_plugin_name">Računanje razdalj in orodje za načrtovanje</string>
     <string name="distance_measurement_finish_subtrack">Začni novo pod-sled</string>
     <string name="wait_current_task_finished">Počakajte, da je trenutna naloga končana</string>
     <string name="use_kalman_filter_compass_descr">Zmanjšuje šum pri branju kompasa, vendar dodaja inercijo</string>
@@ -1281,7 +1282,7 @@
     <string name="choose_osmand_theme">Tema aplikacije</string>
     <string name="accessibility_options">Možnosti dostopnosti</string>
     <string name="local_indexes_cat_srtm">Podatki izohips</string>
-    <string name="shared_string_downloading">Prenašanje …</string>
+    <string name="shared_string_downloading">Prenašanje</string>
 	<string name="use_distance_measurement_help">* Pritisnite za označitev točke.\n * Pritisnite in držite na zemljevidu za brisanje prejšnje točke.\n * Pritisnite in držite na točki za ogled ali dodajanje opisa.\n * Kliknite na vtičnik za meritve za prikaz več dejanj.</string>
     <string name="osmand_extended_description_4000_chars">
 OsmAnd (OSM Automated Navigation Directions - Avtomatsko usmerjanje), je zemljevid in program za navigacijo z dostopom do svetovnih brezplačnih, zelo kakovostnih OpenStreetMap (OSM) podatkov. Vse podatke map je mogoče shraniti na pomnilniško kartico vašega telefona za uporabo brez povezave. OsmAnd ponuja usmerjanje preko GPS-a vaše naprave, s prikazom na ekranu in glasovno, za avto, kolo in pešce. Vse glavne funkcije delujejo tako v povezavi kot brez nje (internet ni potreben).
@@ -1609,8 +1610,8 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="keep_and_add_destination_point">Dodaj kot ciljno točko</string>
     <string name="select_gpx">Izberite GPX …</string>
     <string name="route_descr_select_destination">Izberite cilj</string>
-    <string name="shared_string_select_on_map">Izberite na zemljevidu …</string>
-    <string name="shared_string_favorite">Priljubljene …</string>
+    <string name="shared_string_select_on_map">Izberite na zemljevidu</string>
+    <string name="shared_string_favorite">Priljubljene</string>
     <string name="android_19_location_disabled">Od Android verzije 4.4 (KitKat) naprej, prenos posodobitev zemljevidov ni mogoč na prejšnjo mesto hrambe (%s). Ali želite to spremeniti na takšno mesto, kjer bo to mogoče in skopirati vse OsmAnd podatke tja?
 \n Opomba 1: stare datoteke ne bodo spremenjene (vendar jih lahko ročno izbrišete).
 \n Opomba 2: v novem mestu shrambe si aplikaciji OsmAnd and OsmAnd+ ne bosta mogli deliti podatkov.</string>
@@ -1646,11 +1647,11 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="osmo_settings_uuid">Enolični ID naprave</string>
     <string name="osmo_settings_descr">Nastavi možnosti sledenja in osebni sledilni kanal</string>
     <string name="osmo_plugin_description">"OpenStreetMap napredno sledenje v živo, oglejte si http://osmo.mobi. Omogoča možnosti sledenja drugih naprav in biti sleden. Ustvarite anonimne skupine, katerih člani si med seboj delite lokacije. Ponuja različne možnosti za trajno sledenje ali sledenje v okviru sej. Anonimne skupine so omejene na nekaj dni in nekatere funkcije, npr. ni upravljanja na daljavo in ni skrbnika skupine. Polno delujoče skupine je potrebno ustvariti na spletnem mestu in le registrirani uporabniki imajo dostop do njih. "</string>
-    <string name="osmo_plugin_name">OsMo (Napredno sledenje v živo)</string>
+    <string name="osmo_plugin_name">OsMo spremljanje</string>
     <string name="keep_informing_never">Samo ročno (tapnite puščico)</string>
     <string name="keep_informing_descr">Napoveduj navigacijska navodila v rednih časovnih presledkih</string>
     <string name="keep_informing">Ponavljanje navigacijskih navodil</string>
-	<string name="osmo_settings">OpenStreetMap sledenje</string>
+	<string name="osmo_settings">OsMo sledenje</string>
    	<string name="arrival_distance_descr">Kako hitro želite napoved prihoda?</string>
     <string name="arrival_distance">Napoved prihoda</string>
     
@@ -1864,7 +1865,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="save_track_to_gpx_globally">Beleži sled v datoteko GPX</string>
 	<string name="save_track_interval_globally">Interval beleženja</string>
 	<string name="rendering_attr_publicTransportMode_name">Avtobusne, trolejbusne in druge proge</string>
-	<string name="record_plugin_name">Registracija vaših potovanj</string>
+	<string name="record_plugin_name">Registracija potovanj</string>
     <string name="index_tours">Izleti</string>
     <string name="waypoints">Točke</string>
     <string name="speak_poi">Najavi bližnji POI</string>
@@ -1972,7 +1973,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="save_track_to_gpx_globally_headline">Shranjevanje sledi na zahtevo</string>
 	<string name="parking_place">Parkirno mesto</string>
     <string name="remove_the_tag">ODSTRANJEVANJE OZNAKE</string>
-    <string name="gps_status">GPS Status</string>
+    <string name="gps_status">Stanje GPS</string>
     <string name="version_settings_descr">Prenos nočne gradnje</string>
     <string name="version_settings">Gradnje</string>
     <string name="rendering_attr_streetLighting_name">Ulična razsvetljava</string>
@@ -1991,7 +1992,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="proxy_port_descr">Nastavitev številko vrat vašega proxy-ja (npr. 8118)</string>
 	<string name="shared_string_disabled">Onemogočeno</string>
 	<string name="shared_string_enabled">Omogočeno</string>
-<string name="plugin_ski_name">Smučarske karte</string>
+<string name="plugin_ski_name">Pogled smučarska karta</string>
     <string name="plugin_nautical_name">Pomorska karta</string>
     <string name="world_ski_missing">Če želite prikazati smučarske karte, morate prenesti posebne zemljevide za delovanje brez povezave</string>
     <string name="nautical_maps_missing">Če želite prikazati pomorske karte, morate prenesti posebne zemljevide za delovanje brez povezave</string>
@@ -2008,4 +2009,37 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="rendering_attr_pisteGrooming_name">Teptanje smučarskih prog</string>
     <string name="track_segments">Segmenti sledi</string>
 	<string name="track_points">Točke sledi</string>
-	</resources>
\ No newline at end of file
+	<string name="action_create">Ustvarjanje dejanja</string>
+	<string name="action_modify">Sprememba dejanja</string>
+	<string name="action_delete">Brisanje dejanja</string>
+	<string name="osm_edits">OSM urejanje</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Ostaja</string> <string name="parking_place_limited">Parkirno mesto časovno omejeno</string>
+	<string name="your_edits">Vaše spremembe</string>
+    <string name="drawer">Seznam</string>
+    <string name="short_location_on_map">Šir %1$s\n Dol %2$s</string>
+    <string name="tips_and_tricks_descr">Pogosto zastavljena vprašanja, nedavne spremembe in ostalo</string>
+    <string name="routing_settings_2">Nastavitve navigacije</string>
+    <string name="general_settings_2">Splošne nastavitve</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_selected">Izbrano</string>
+	<string name="shared_string_deselect">Odstrani iz izbora</string>
+	<string name="shared_string_deselect_all">Počisti izbor</string>
+	<string name="shared_string_export">Izvozi</string>
+	<string name="shared_string_unexpected_error">Prišlo je do nepričakovane napake</string>
+	<string name="shared_string_action_template">Dejanje {0}</string>
+	<string name="shared_string_collapse">Skrči</string>
+	<string name="shared_string_currently_recording_track">Trenutno beležena sled</string>
+	<string name="shared_string_audio">Zvok</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Fotografija</string>
+	<string name="route_points">Točke poti</string>
+	<string name="rename_failed">Preimenovanje ni uspelo.</string>
+	<string name="days_behind">dni star</string>
+	<string name="back_to_map">Nazaj na zemljevid</string>
+	<string name="share_note">Deli opombo</string>
+    <string name="location_on_map">Lokacija:\n Šir %1$s\n Dol %2$s</string>
+	<string name="notes">Osombe</string>
+	<string name="online_map">Spletni zemljevid</string>
+	<string name="roads_only">Le ceste</string>
+    <string name="shared_string_release">Izdano</string>
+	</resources>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 3484347200..f0b52eab18 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -141,7 +141,7 @@
 
 <string name="index_settings_descr">Ladda ner och hantera offline-kartor lagrade på din enhet</string>
 <string name="online_map_settings">Online-kartor</string>
-<string name="osmand_accessibility_description">Visar inställningarna för att aktivera speciella tillgänglighetsfunktioner.</string>
+<string name="osmand_accessibility_description">Denna modul låter inställningarna för att aktivera speciella tillgänglighetsfunktioner bli direkt åtkomliga i OsmAnd och underlättar t.ex. justering av talhastigheten för TTS-röster, konfigurering av skärmnavigering med hjälp av en trackball för zoomkontroll eller användande av återkoppling med text-till-tal.</string>
 
 
 <string name="debugging_and_development">Utveckling av OsmAnd</string>
@@ -227,7 +227,7 @@
 \n\nKartbitar (tile maps) kan hämtas direkt online eller förberedas för användning offline (och kopieras manuellt till OsmAnds datamapp) som en sqlite-databas som kan skapas med olika tredjepartsverktyg. "</string>
 <string name="osmand_background_plugin_description">Visa inställningarna för att aktivera spårning och navigering i viloläge (skärm av) genom att periodvis väcka GPS-enheten.</string>
 
-<string name="osmand_development_plugin_description">Visar inställningarna för utvecklings- och felsökningsfunktioner som ruttsimulering eller visning av renderingsprestanda.</string>
+<string name="osmand_development_plugin_description">Denna modul visar inställningarna för utvecklings- och felsökningsfunktioner som rutt-testning och -simulering eller visning av renderingsprestanda eller röststyrning. Dessa inställningar är avsedda för utvecklare och behövs inte för den vanliga användaren.</string>
 <string name="plugins_screen">Hantera insticksmoduler</string>
 <string name="tip_recent_changes_0_8_2_t">"Förändringar i 0.8.2 :\n\t* Förbättrad ruttuträkning\n\t* Widgets för dynamisk karta\n\t* Kartinställningar flyttade till kartskärmen\n\t* Lås skärm knapp med logga tjänster\n\t* Fixat arabiska, Kannada skript och RTL språk "</string>
 
@@ -250,7 +250,7 @@
 \n\t - Offline-ruttning blir mer robust↵
 \n\t *Användbarhet och UI-erfarenhet*↵
 \n\t - Förbättrats på många områden "</string>
-<string name="osm_editing_plugin_description">Med denna modul kan OsmAnd användas för att göra bidrag till OSM såsom samlande/modifierande av OSM POI-objekt, öppnande/kommenterande av OSM-buggar, och bidragande med inspelade GPX-filer. För att använda denna funktion krävs OSM-referenser.</string>
+<string name="osm_editing_plugin_description">"Med denna modul kan OsmAnd användas för att göra bidrag till OSM såsom samlande/modifierande av OSM POI-objekt, öppnande/kommenterande av OSM-buggar, och bidragande med inspelade GPX-filer. OSM är ett globalt kartprojekt inom public domain, För mer info, se  http://openstreetmap.org. Aktivt deltagande uppskattas och bidrag kan ges direkt i OsmAnd om du anger dina personiga OSM-referenser i appen."</string>
 <string name="vector_maps_may_display_faster_on_some_devices">Vektorkartor ritas sannolikt upp snabbare. Fungerar kanske inte så bra på vissa enheter.</string>
 <string name="play_commands_of_currently_selected_voice">Spela upp kommandon med aktuell röst</string>
 <string name="test_voice_prompts">Test av röstmeddelanden</string>
@@ -806,7 +806,7 @@
 	<string name="hint_search_online">Online-sökning: Husnummer, gata, stad</string>
 	<string name="search_offline_address">Offline</string>
 	<string name="max_level_download_tile_descr">Välj högsta zoomnivå att ladda ner för online-kartbitar</string>
-	<string name="route_general_information">Total sträcka %1$s \n restid %2$d h %3$d m.</string>
+	<string name="route_general_information">Total sträcka %1$s, restid %2$d h %3$d m.</string>
 	<string name="router_service_descr">Välj en online- eller offline-navigeringstjänst</string>
 	<string name="router_service">Navigeringstjänst</string>
 	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet är inte tillgänglig!</string>
@@ -922,7 +922,7 @@
     <string name="map_widget_distancemeasurement">Avståndsmätning</string>
     
     <string name="map_widget_audionotes">Ljudanteckningar</string>
-    <string name="audionotes_plugin_description">Denna modul visar knappar för ljud-/foto-/videoanteckningar under en resa</string>
+    <string name="audionotes_plugin_description">Denna modul för ljud- och videoanteckningar erbjuder möjlighet att skapa ljud-/foto-/videoanteckningar under en resa, antingen med hjälp av en knapp på kartskärmen eller direkt i kontextmenyn för en position på kartan.</string>
     <string name="audionotes_plugin_name">Ljud-/Videoanteckningar</string>
     <string name="index_srtm_parts">delar</string>
     <string name="index_srtm_ele">Höjdkurvor</string>
@@ -1380,7 +1380,7 @@
     <string name="osmo_settings_descr">Konfigurera inställningar för övervakning och ställ in personlig övervakningskanal</string>
     <string name="osmo_plugin_name">OSMo-spårning</string>
     <string name="osmo_settings">OsMo-spårning</string>
-   	<string name="osmo_plugin_description">"Visar inställningarna för OsMo - avancerad direktspårning. Se http://osmo.mobi. Spåra andra enheter och bli spårad själv. Skapa anonyma grupper, dela med er av era positioner och kommunicera med varandra.\n\nDet finns olika inställningar för sessionsspårning eller permanent spårning. Anonyma grupper är begränsade till ett antal dagar och för vissa funktioner finns ingen fjärrkontroll eller gruppadministratör. Helt fungerande grupper bör skapas på webbplatsen och endast registrerade användare har tillgång till dem. "</string>
+   	<string name="osmo_plugin_description">"Denna modul erbjuder funktioner för OsMo - avancerad direktspårning. Se http://osmo.mobi.\n\nDu kan spåra andra enheter och bli spårad själv. Du kan skapa anonyma grupper, dela med er av era positioner och kommunicera med varandra. Det finns olika alternativ för sessionsspårning eller permanent spårning.\n\nAnonyma grupper kan skapas för ett specificerat antal dagar och begränsas till bestämda funktioner, d.v.s. det finns ingen fjärrkontroll eller gruppadministratör. Helt fungerande grupper kan å andra sidan skapas på webbplatsen och endast registrerade användare har tillgång till dem. "</string>
     <string name="interrupt_music_descr">Avbryt musik vid meddelanden</string>
 	<string name="interrupt_music">Avbryt musik</string>
 	<string name="share_route_as_gpx">Dela rutt som GPX-fil</string>
@@ -1830,4 +1830,7 @@
 	<string name="waypoint_visit_after">Besök efter</string>
     <string name="waypoint_visit_before">Besök före</string>
     <string name="shared_string_collapse">Slå ihop</string>
-	</resources>
+	<string name="osm_edits">OSM-redigeringar</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">kvar</string> <string name="parking_place_limited">Tidsbegränsad parkering</string>
+	<string name="your_edits">Dina redigeringar</string>
+    </resources>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 2191d62139..236bd95dd2 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -18,79 +18,79 @@
 	<string name="poi_dairy">Молочний магазин</string>
 	<string name="poi_vending_machine">Торговий автомат</string>
 
-	<string name="poi_bookshop">Книжковий магазин</string>
-	<string name="poi_bicycle_shop">Веломагазин</string>
-	<string name="poi_anime_shop">Магазин аніме</string>
-	<string name="poi_antiques_shop">Антикваріат</string>
-	<string name="poi_art_shop">Витвори мистетства</string>
+	<string name="poi_books">Книжковий магазин</string>
+	<string name="poi_bicycle">Веломагазин</string>
+	<string name="poi_anime">Магазин аніме</string>
+	<string name="poi_antiques">Антикваріат</string>
+	<string name="poi_art">Витвори мистетства</string>
 	<string name="poi_baby_goods">Товари для дітей</string>
-	<string name="poi_bag_shop">Сумки, валізи</string>
-	<string name="poi_bathroom_furnishing_shop">Все для ванної кімнати</string>
-	<string name="poi_bed_shop">Все для спальні</string>
+	<string name="poi_bag">Сумки, валізи</string>
+	<string name="poi_bathroom_furnishing">Все для ванної кімнати</string>
+	<string name="poi_bed">Все для спальні</string>
 	<string name="poi_boutique">Бутік</string>
-	<string name="poi_carpet_shop">Килими</string>
-	<string name="poi_chemist_shop">Аптека</string>
-	<string name="poi_clothes_shop">Магазин одягу</string>
-	<string name="poi_children_clothes_shop">Дитячий одяг</string>
+	<string name="poi_carpet">Килими</string>
+	<string name="poi_chemist">Аптека</string>
+	<string name="poi_clothes">Магазин одягу</string>
+	<string name="poi_children_clothes">Дитячий одяг</string>
 	<string name="poi_shoes">Магазин взуття</string>
-	<string name="poi_computer_shop">Комп’ютерний магазин</string>
+	<string name="poi_computer">Комп’ютерний магазин</string>
 	<string name="poi_copyshop">Копіювальні послуги, полігрфафія</string>
-	<string name="poi_curtain_shop">Салон штор</string>
-	<string name="poi_fabric_shop">Тканини</string>
-	<string name="poi_bedding_shop">Постільна білизна</string>
-	<string name="poi_dive_shop">Спорядження для пірнання</string>
-	<string name="poi_doityourself_shop">Інструменти та будматеріали</string>
-	<string name="poi_erotic_shop">Секс-шоп</string>
-	<string name="poi_fishing_shop">Рибальські снасті</string>
+	<string name="poi_curtain">Салон штор</string>
+	<string name="poi_fabric">Тканини</string>
+	<string name="poi_bedding">Постільна білизна</string>
+	<string name="poi_dive">Спорядження для пірнання</string>
+	<string name="poi_doityourself">Інструменти та будматеріали</string>
+	<string name="poi_erotic">Секс-шоп</string>
+	<string name="poi_fishing">Рибальські снасті</string>
 	<string name="poi_florist">Квітковий магазин</string>
-	<string name="poi_frame_shop">Рамки, багет</string>
-	<string name="poi_furniture_shop">Меблі</string>
+	<string name="poi_frame">Рамки, багет</string>
+	<string name="poi_furniture">Меблі</string>
 	<string name="poi_garden_centre">Сад та город</string>
-	<string name="poi_gas_shop">Зріджений газ</string>
-	<string name="poi_general_shop">Магазин</string>
-	<string name="poi_gift_shop">Подарунки та сувеніри</string>
-	<string name="poi_glaziery_shop">Вікна, скло</string>
-	<string name="poi_hardware_shop">Будівельний магазин</string>
-	<string name="poi_hearing_aids_shop">Слухові апарати</string>
+	<string name="poi_gas">Зріджений газ</string>
+	<string name="poi_general">Магазин</string>
+	<string name="poi_gift">Подарунки та сувеніри</string>
+	<string name="poi_glaziery">Вікна, скло</string>
+	<string name="poi_hardware">Будівельний магазин</string>
+	<string name="poi_hearing_aids">Слухові апарати</string>
 	<string name="poi_herbalist">Трави</string>
-	<string name="poi_hifi_shop">HiFi апаратура</string>
-	<string name="poi_houseware_shop">Господарські товари</string>
-	<string name="poi_hunting_shop">Мисливське спорядження</string>
-	<string name="poi_interior_decoration_shop">Внутрішнє оздоблення</string>
-	<string name="poi_jewelry_shop">Ювелірний магазин</string>
+	<string name="poi_hifi">HiFi апаратура</string>
+	<string name="poi_houseware">Господарські товари</string>
+	<string name="poi_hunting">Мисливське спорядження</string>
+	<string name="poi_interior_decoration">Внутрішнє оздоблення</string>
+	<string name="poi_jewelry">Ювелірний магазин</string>
 	<string name="poi_kiosk">Кіоск</string>
-	<string name="poi_kitchen_shop">Кухонні приналежності</string>
-	<string name="poi_mobile_phone_shop">Мобільні телефони</string>
-	<string name="poi_motorcycle_shop">Мотоцикли</string>
-	<string name="poi_musical_instrument_shop">Музичні інструменти</string>
-	<string name="poi_newsagent_shop">Газети та журнали</string>
+	<string name="poi_kitchen">Кухонні приналежності</string>
+	<string name="poi_mobile_phone">Мобільні телефони</string>
+	<string name="poi_motorcycle">Мотоцикли</string>
+	<string name="poi_musical_instrument">Музичні інструменти</string>
+	<string name="poi_newsagent">Газети та журнали</string>
 	<string name="poi_optician_shop">Окуліст</string>
-	<string name="poi_organic_shop">Органічні продукти харчування</string>
-	<string name="poi_outdoor_shop">Товари для активного відпочинку</string>
-	<string name="poi_paint_shop">Фарби</string>
-	<string name="poi_pet_shop">Зоомагазин</string>
-	<string name="poi_radiotechnics_shop">Радіодеталі</string>
+	<string name="poi_organic">Органічні продукти харчування</string>
+	<string name="poi_outdoor">Товари для активного відпочинку</string>
+	<string name="poi_paint">Фарби</string>
+	<string name="poi_pet">Зоомагазин</string>
+	<string name="poi_radiotechnics">Радіодеталі</string>
 	<string name="poi_second_hand">Секонд-хенд</string>
 	<string name="poi_ship_chandler">Яхти, запчастини, оснащення</string>
-	<string name="poi_sports_shop">Спорттовари</string>
-	<string name="poi_stationery_shop">Канцтовари</string>
-	<string name="poi_tableware_shop">Посуд</string>
-	<string name="poi_ticket_shop">Продаж квитків</string>
-	<string name="poi_tobacco_shop">Тютюн</string>
-	<string name="poi_toys_shop">Іграшки</string>
-	<string name="poi_trade_shop">Факторія</string>
-	<string name="poi_vacuum_cleaner_shop">Пилососи</string>
+	<string name="poi_sports">Спорттовари</string>
+	<string name="poi_stationery">Канцтовари</string>
+	<string name="poi_tableware">Посуд</string>
+	<string name="poi_ticket">Продаж квитків</string>
+	<string name="poi_tobacco">Тютюн</string>
+	<string name="poi_toys">Іграшки</string>
+	<string name="poi_trade">Факторія</string>
+	<string name="poi_vacuum_cleaner">Пилососи</string>
 	<string name="poi_variety_store">Універсальний магазин</string>
-	<string name="poi_video_shop">Відео-прокат</string>
-	<string name="poi_window_blind_shop">Жалюзі, віконниці, маркізи</string>
+	<string name="poi_video">Відео-прокат</string>
+	<string name="poi_window_blind">Жалюзі, віконниці, маркізи</string>
 	<string name="poi_department_store">Универмаг</string>
-	<string name="poi_electronics_shop">Електороніка</string>
+	<string name="poi_electronics">Електороніка</string>
 	<string name="poi_car_shop">Автосалон</string>
 	<string name="poi_car_parts_shop">Автозапчастини</string>
-	<string name="poi_atv_shop">Квадроцикли</string>
-	<string name="poi_cosmetics_shop">Косметика</string>
+	<string name="poi_atv">Квадроцикли</string>
+	<string name="poi_cosmetics">Косметика</string>
 	<string name="poi_marketplace">Ринок</string>
-	<string name="poi_sewing_shop">Галантерея</string>
+	<string name="poi_sewing">Галантерея</string>
 
 	<string name="poi_police">Міліція/Поліція</string>
 	<string name="poi_fire_station">Пожежна частиниа</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index cdbbe3930d..c2d0277bd9 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -203,16 +203,16 @@
 	<string name="osmand_rastermaps_plugin_description">"有了這個外掛元件，您可以存取多種類型的網絡（所謂的圖磚或網格）地圖，從預設的 Openstreetmap 圖磚（如 Mapnik）到衛星圖像和特殊用途的圖層，比如天氣地圖、氣候地圖、地質地圖、山體陰影層等。\n\n這些地圖可以被用來作為主要的（基本）地圖，以便在 OsmAnd 地圖螢幕上顯示，或作為覆疊層又或另外基本地圖的底層（如 OsmAnd 正常的離線地圖）。為了使任何的底層地圖可以看見，OsmAnd 向量地圖可以容易的根據需要透過 \'組態地圖\' 選單來隱藏某些構成。
 \n\n地圖圖磚可以直接透過線上資料來源獲得，或著可以使用準備好的離線地圖（手動複製到 OsmAnd 的資料檔案夾中） 作為一個 sqlite 資料庫，可以透過各種的第三方地圖編制工具產生。 "</string>
 	<string name="osmand_background_plugin_description">透過週期性的喚醒 GPS 裝置，在休眠模式下(螢幕關閉)顯示設定以啟用追蹤與導航。</string>
-	<string name="osmand_accessibility_description">顯示設定以啟動指定的無障礙功能。</string>
+	<string name="osmand_accessibility_description">這個外掛元件，讓裝置在 OsmAnd 可直接用無障礙功能以及便利，例如調整 TTS 語音的語音速率、組態螢幕導航方位、使用軌跡球為縮放控制，或使用文字轉語音的回應。</string>
 	
 	
 	
-	<string name="osmand_development_plugin_description">顯示開發與除錯功能的設定，如導航模擬或繪製效能表示。</string>
+	<string name="osmand_development_plugin_description">這個外掛元件顯示開發與除錯功能的設定，如測試或模擬路線、螢幕繪製效能或語音提示。這些設定適用于開發人員，普通使用者並不需要。</string>
 	<string name="plugins_screen">外掛元件管理</string>
 	
 	<string name="prefs_plugins_descr">啟動外掛元件進階的設定和更多的附加功能</string>
 	<string name="prefs_plugins">外掛元件管理</string>
-	<string name="osm_editing_plugin_description">透過這個外掛元件 OsmAnd 可以用來對 OSM 作貢獻，如建立或修改 OSM POI 物件、開啟或評論 OSM 的錯誤和提供 GPX 檔案。使用此功能需有 OSM 個人帳號。</string>
+	<string name="osm_editing_plugin_description">透過這個外掛元件 OsmAnd 可以用來對 OSM 作貢獻，如建立或修改 OSM POI 物件、開啟或評論 OSM 的錯誤和提供 GPX 檔案。OSM 是一個社群推動，相關的詳細資訊，請參閱 http://openstreetmap.org。如果您在應用程式中指定您個人的 OSM 帳號，可直接從 OsmAnd 進行貢獻，積極參與是令人感激的 。</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">向量地圖一般而言顯示速度更快，但可能在某些裝置上無法使用。</string>
 	<string name="play_commands_of_currently_selected_voice">用目前選擇的語音播放指令</string>
 	<string name="debugging_and_development">OsmAnd 開發</string>
@@ -441,7 +441,7 @@
 	<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已順利停用。</string>
 	<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已順利刪除。</string>
 	<string name="local_index_items_restored">%2$d 項中的 %1$d 項已順利啟動。</string>
-	<string name="local_index_action_do">您即將 %2$s 個項目 %1$s，要繼續嗎？</string>
+	<string name="local_index_action_do">您即將到 %2$s 的 %1$s 的項目，要繼續嗎？</string>
 	<string name="local_index_descr_title">管理地圖檔案</string>
 	<string name="local_index_mi_restore">啟用</string>
 	<string name="local_index_mi_backup">停用</string>
@@ -533,12 +533,11 @@
 \n\t*興趣點（按類型或名稱）
 \n\t*透過您的查尋履歷
 \n\t*或透過您事先定義的我的最愛
-\n\n在主畫面上按\'查尋\'進行查尋的動作。所有在快顯功能表中或動作列被點選中的，都提供有例如\'導引\'或\'在地圖上顯示\'等等的選項。 "</string>
+\n\n為所有在快顯選單中或行動列被點選，都提供有例如\'導引\'或\'在地圖上顯示\'等的選項。 "</string>
 	<string name="tip_map_context_menu">\'使用位置\'選單</string>
-	<string name="tip_map_context_menu_t">地圖快顯功能表(\'使用位置\')，包含了所有操作的參考點（位置）。
-		\n\n它可長按地圖上的任何一點（然後輕點其標記），或按軌跡球的按鈕，或者選擇由\'選單\' → \'使用位置\'（最後兩種方式以地圖中心作為參考）。
-		\n\n若長按則可以再次隱藏標記對話框。
-	</string>
+	<string name="tip_map_context_menu_t">"地圖快顯功能表\'使用位置\'，包含了所有作用引到一個點（位置）。
+\n\n它可長按地圖上的任何一點（然後輕點其標記），或按軌跡球的按鈕，或者選擇由\'選單\' → \'使用位置\'（最後兩種方式以地圖中心作為參考）。
+\n\n若長按則可以再次隱藏標記對話框。 "</string>
 	
 	<string name="tip_initial_t">"OsmAnd 是一個導航應用程式，含有很多的功能。
 \n\n一些基本功能介紹、使用提示以及進階的幫助，從地圖畫面可透過\'選單\' → \'幫助\'連結。 "</string>
@@ -784,7 +783,7 @@
 	<string name="search_online_address">線上查尋</string>
 	<string name="max_level_download_tile">線上最大縮放比</string>
 	<string name="max_level_download_tile_descr">選擇線上下載地圖圖磚最大縮放級別</string>
-	<string name="route_general_information">總距離 %1$s \n 行駛時間 %2$d 小時 %3$d 分。</string>
+	<string name="route_general_information">總距離 %1$s，行駛時間 %2$d 小時 %3$d 分。</string>
 	<string name="router_service_descr">選擇線上或離線的導航服務</string>
 	<string name="router_service">導航服務</string>
 	<string name="sd_dir_not_accessible">在 SD 卡上的存儲資料夾無法存取！</string>
@@ -943,10 +942,10 @@
 	<string name="poi_remove_title">刪除興趣點</string>
 	<string name="poi_remove_success">興趣點刪除成功</string>
 	<string name="poi_action_add">新增</string>
-	<string name="poi_action_change">修改</string>
-	<string name="poi_action_succeded_template">啟動{0}動作完成。</string>
-	<string name="poi_error_unexpected_template">在進行{0}動作時發生意外錯誤。</string>
-	<string name="poi_error_io_error_template">執行{0}時發生存取錯誤。</string>
+	<string name="poi_action_change">更改</string>
+	<string name="poi_action_succeded_template">運作 {0} 成功完成。</string>
+	<string name="poi_error_unexpected_template">在進行 {0} 運作時發生意外錯誤。</string>
+	<string name="poi_error_io_error_template">當執行 {0} 運作時發生 I/O 錯誤。</string>
 	<string name="poi_error_info_not_loaded">節點的資訊未載入</string>
 	<string name="poi_dialog_name">名稱</string>
 	<string name="poi_dialog_opening_hours">營業</string>
@@ -974,10 +973,7 @@
     <string name="local_osm_changes_backup_failed">備份 OSM 的變更失敗</string>
     <string name="local_osm_changes_backup">備份 OSM 的變更</string>
     <string name="plugin_distance_point_hdop">精確度</string>
-    <string name="use_distance_measurement_help">* 點選標記一個標點。\n 
-        * 在地圖上按住去刪除先前的標點。\n
-        * 在標點上按住以檢視並附加敘述。\n
-        * 在測量小工具上點擊可看到更多作用。</string>
+    <string name="use_distance_measurement_help">* 點選標記一個標點。\n * 在地圖上按住去刪除先前的標點。\n * 在標點上按住以檢視並附加敘述。\n * 在測量小工具上點擊可看到更多的作用。</string>
     <string name="distance_measurement_start_editing">開始編輯</string>
     <string name="distance_measurement_finish_editing">結束編輯</string>
     <string name="distance_measurement_finish_subtrack">開始一個新的子軌跡</string>
@@ -1043,8 +1039,8 @@
     <string name="av_def_action_choose">應需求選取</string>
     <string name="av_def_action_video">錄取視訊</string>
     <string name="av_def_action_audio">錄取音訊</string>
-    <string name="av_widget_action_descr">選擇預設小工具的機能</string>
-    <string name="av_widget_action">預設小工具動作</string>
+    <string name="av_widget_action_descr">選擇預設小工具的作用</string>
+    <string name="av_widget_action">預設小工具作用</string>
     <string name="av_video_format_descr">選擇視訊輸出格式</string>
     <string name="av_video_format">視訊輸出格式</string>
     <string name="tip_recent_changes_1_4_t">在1.4的變更：
@@ -1084,7 +1080,7 @@
     <string name="map_widget_distancemeasurement">測量距離</string>
     
     <string name="map_widget_audionotes">音訊注解</string>
-    <string name="audionotes_plugin_description">這個外掛元件提供的功能和按鈕以在旅程中記錄音訊/攝影/視訊等注解</string>
+    <string name="audionotes_plugin_description">音訊/視訊注解外掛元件提供的功能，在旅程中取得音訊/照相/視訊注解，使用在地圖畫面上的按鈕，或地圖上任何的位置直接叫出快顯選單。</string>
     <string name="audionotes_plugin_name">音訊/視訊注解</string>
     <string name="index_srtm_parts">部件</string>
     <string name="index_srtm_ele">等高線</string>
@@ -1504,7 +1500,7 @@
     <string name="osmo_plugin_name">OsMo (監視)</string>
     <string name="osmo_settings">OsMo 監控</string>
    	<string name="osmo_settings_descr">組態監控設定值和安裝個人監控頻道</string>
-    <string name="osmo_plugin_description">"OsMo 進階即時監控，跟蹤其它裝置並進行追蹤，請參閱 http://osmo.mobi。建立匿名群組，分享彼此的位置和交流。它具有各種設定用於連線階段追蹤或持續的追蹤。\n\n匿名群組是有限制天數和一些功能，也就是沒有遠端控制和群組管理員。完整的功能需在網站上建立群組，並且只有已註冊的使用者才能進入他們。 "</string>
+    <string name="osmo_plugin_description">"這個外掛元件同時提供了 OsMo 進階即時監控，請參閱 http://osmo.mobi。\n\n您可以跟蹤其它裝置並進行追蹤。您可以自發的建立匿名群組，分享彼此的位置和交流。具有各種選項用於連線階段追蹤或持續的追蹤。\n\n為指定的天數建立匿名群組和有限制的預設功能，例如沒有遠端控制和沒有群組管理員。另一方面完整的功能可以在網站上建立群組，並且只有已註冊的使用者才能進入他們。 "</string>
     <string name="keep_informing_never">只有手動（輕點箭頭）</string>
     <string name="keep_informing_descr">按照定期間隔重新通報導航指示</string>
     <string name="keep_informing">重複導航指示</string>
@@ -1916,13 +1912,13 @@
 	<string name="shared_string_downloading">下載中</string>
 	<string name="shared_string_download_successful">下載成功</string>
 	<string name="shared_string_unexpected_error">發生意外錯誤</string>
-	<string name="shared_string_action_template">動作 {0}</string>
+	<string name="shared_string_action_template">行動 {0}</string>
 	<string name="shared_string_close">關閉</string>
 	<string name="shared_string_exit">離開</string>
 	<string name="shared_string_show">顯示</string>
 	<string name="shared_string_show_all">全部顯示</string>
 	<string name="shared_string_show_on_map">在地圖上顯示</string>
-	<string name="shared_string_more_actions">更多的動作</string>
+	<string name="shared_string_more_actions">更多的行動</string>
 	<string name="shared_string_map">地圖</string>
 	<string name="shared_string_favorites">我的最愛</string>
 	<string name="shared_string_add_to_favorites">加到我的最愛</string>
@@ -1945,4 +1941,10 @@
     <string name="shared_string_dismiss">解除</string>
 	<string name="shared_string_collapse">崩潰</string>
 	<string name="drawer">平面清單</string>
-    </resources>
+    <string name="osm_edits">OSM 編輯</string>
+	<string name="osmand_parking_hour">時</string><string name="osmand_parking_minute">分</string><string name="osmand_parking_time_left">左</string> <string name="parking_place_limited">停車場時限</string>
+	<string name="your_edits">您的編輯</string>
+    <string name="action_create">行動建立</string>
+	<string name="action_modify">行動修改</string>
+	<string name="action_delete">行動刪除</string>
+	</resources>
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index d661228c09..b305a00245 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -36,7 +36,8 @@
 		<attr name="expandable_list_background" format="color"/>
 		<attr name="list_settings_icon" format="reference"/>
 		<attr name="size_progress_bar" format="reference"/>
-		<attr name="dash_parking_bg" format="color"/>
+		<attr name="dash_parking_bg" format="reference"/>
+		<attr name="osmo_header_background" format="color"/>
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index f14630d148..a63011a802 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<color name="osmo_header_dark">#2d383d</color>
+	<color name="osmo_header_light">#b36d12</color>
+
+	<color name="parking_card_selected">#234DDE</color>
+	<color name="dashboard_parking_dark_color">#54778c</color>
+	<color name="dashboard_parking_dark_selected">#446072</color>
+
 	<color name="list_divider_dark">#1f2326</color>
 	<color name="list_divider_light">@color/color_white</color>
 	<color name="list_background_dark">#292f33</color>
@@ -42,7 +49,7 @@
 	<color name="dashboard_subheader_text_light">#212121</color>
 	<color name="dashboard_general_button_text_dark">#ff8f00</color>
 	<color name="dashboard_general_button_text_light">#536DFE</color>
-	<color name="dashboard_parking_dark">#54778c</color>
+
 
 	<color name="color_transparent">#00000000</color>
 	<color name="widgettext_night">#ffC8C8C8</color>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 0bb1c2891d..fbaf6ad865 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -41,79 +41,79 @@
 	<string name="poi_vending_machine">Vending machine</string>
 	<string name="poi_wine">Wine shop</string>
 
-	<string name="poi_bookshop">Bookstore</string>
-	<string name="poi_bicycle_shop">Bicycle shop</string>
-	<string name="poi_anime_shop">Anime shop</string>
-	<string name="poi_antiques_shop">Antiques store</string>
-	<string name="poi_art_shop">Art shop</string>
+	<string name="poi_books">Bookstore</string>
+	<string name="poi_bicycle">Bicycle shop</string>
+	<string name="poi_anime">Anime shop</string>
+	<string name="poi_antiques">Antiques store</string>
+	<string name="poi_art">Art shop</string>
 	<string name="poi_baby_goods">Baby goods</string>
-	<string name="poi_bag_shop">Bag shop</string>
-	<string name="poi_bathroom_furnishing_shop">Bathroom furnishings</string>
-	<string name="poi_bed_shop">Bed room furnishings</string>
+	<string name="poi_bag">Bag shop</string>
+	<string name="poi_bathroom_furnishing">Bathroom furnishings</string>
+	<string name="poi_bed">Bed room furnishings</string>
 	<string name="poi_boutique">Fashion boutique</string>
-	<string name="poi_carpet_shop">Carpet shop</string>
-	<string name="poi_chemist_shop">Drug store</string>
-	<string name="poi_clothes_shop">Apparel store</string>
-	<string name="poi_child_clothes_shop">Childrens apparel</string>
+	<string name="poi_carpet">Carpet shop</string>
+	<string name="poi_chemist">Drug store</string>
+	<string name="poi_clothes">Apparel store</string>
+	<string name="poi_child_clothes">Childrens apparel</string>
 	<string name="poi_shoes">Shoe store</string>
-	<string name="poi_computer_shop">Computer store</string>
+	<string name="poi_computer">Computer store</string>
 	<string name="poi_copyshop">Copy shop</string>
-	<string name="poi_curtain_shop">Curtain shop</string>
-	<string name="poi_fabric_shop">Drapery shop</string>
-	<string name="poi_bedding_shop">Bedding store</string>
-	<string name="poi_dive_shop">Diving equipment</string>
-	<string name="poi_doityourself_shop">Home improvement store</string>
-	<string name="poi_erotic_shop">Erotic shop</string>
-	<string name="poi_fishing_shop">Fishing tackle</string>
+	<string name="poi_curtain">Curtain shop</string>
+	<string name="poi_fabric">Drapery shop</string>
+	<string name="poi_bedding">Bedding store</string>
+	<string name="poi_dive">Diving equipment</string>
+	<string name="poi_doityourself">Home improvement store</string>
+	<string name="poi_erotic">Erotic shop</string>
+	<string name="poi_fishing">Fishing tackle</string>
 	<string name="poi_florist">Flower shop</string>
-	<string name="poi_frame_shop">Picture frame shop</string>
-	<string name="poi_furniture_shop">Furniture store</string>
+	<string name="poi_frame">Picture frame shop</string>
+	<string name="poi_furniture">Furniture store</string>
 	<string name="poi_garden_centre">Garden center</string>
-	<string name="poi_gas_shop">Liquid gas store</string>
+	<string name="poi_gas">Liquid gas store</string>
 	<string name="poi_general">General store</string>
-	<string name="poi_gift_shop">Gift shop</string>
-	<string name="poi_glaziery_shop">Glaziery</string>
-	<string name="poi_hardware_shop">Hardware store</string>
-	<string name="poi_hearing_aids_shop">Hearing aids</string>
+	<string name="poi_gift">Gift shop</string>
+	<string name="poi_glaziery">Glaziery</string>
+	<string name="poi_hardware">Hardware store</string>
+	<string name="poi_hearing_aids">Hearing aids</string>
 	<string name="poi_herbalist">Herb store</string>
-	<string name="poi_hifi_shop">HiFi store</string>
-	<string name="poi_houseware_shop">Household supply store</string>
-	<string name="poi_hunting_shop">Hunting equipment</string>
-	<string name="poi_interior_decoration_shop">Interior decoration store</string>
-	<string name="poi_jewelry_shop">Jewelry store</string>
+	<string name="poi_hifi">HiFi store</string>
+	<string name="poi_houseware">Household supply store</string>
+	<string name="poi_hunting">Hunting equipment</string>
+	<string name="poi_interior_decoration">Interior decoration store</string>
+	<string name="poi_jewelry">Jewelry store</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Kitchen furnishings</string>
-	<string name="poi_mobile_phone_shop">Cell phone store</string>
-	<string name="poi_motorcycle_shop">Motorcycle shop</string>
-	<string name="poi_musical_instrument_shop">Musical instruments</string>
-	<string name="poi_newsagent_shop">Newsagency</string>
+	<string name="poi_kitchen">Kitchen furnishings</string>
+	<string name="poi_mobile_phone">Cell phone store</string>
+	<string name="poi_motorcycle">Motorcycle shop</string>
+	<string name="poi_musical_instrument">Musical instruments</string>
+	<string name="poi_newsagent">Newsagency</string>
 	<string name="poi_optician_shop">Optometrist</string>
-	<string name="poi_organic_shop">Organic food</string>
-	<string name="poi_outdoor_shop">Outdoor store</string>
-	<string name="poi_paint_shop">Paint shop</string>
-	<string name="poi_pet_shop">Pet shop</string>
-	<string name="poi_radiotechnics_shop">Radiotechnics store</string>
+	<string name="poi_organic">Organic food</string>
+	<string name="poi_outdoor">Outdoor store</string>
+	<string name="poi_paint">Paint shop</string>
+	<string name="poi_pet">Pet shop</string>
+	<string name="poi_radiotechnics">Radiotechnics store</string>
 	<string name="poi_second_hand">Second hand store</string>
 	<string name="poi_ship_chandler">Ship chandler</string>
-	<string name="poi_sports_shop">Sporting goods</string>
-	<string name="poi_stationery_shop">Stationery shop</string>
-	<string name="poi_tableware_shop">Tableware shop</string>
-	<string name="poi_ticket_shop">Ticket shop</string>
-	<string name="poi_tobacco_shop">Tobacco store</string>
-	<string name="poi_toys_shop">Toys store</string>
-	<string name="poi_trade_shop">Trading post</string>
-	<string name="poi_vacuum_cleaner_shop">Vacuum cleaner store</string>
+	<string name="poi_sports">Sporting goods</string>
+	<string name="poi_stationery">Stationery shop</string>
+	<string name="poi_tableware">Tableware shop</string>
+	<string name="poi_ticket">Ticket shop</string>
+	<string name="poi_tobacco">Tobacco store</string>
+	<string name="poi_toys">Toys store</string>
+	<string name="poi_trade">Trading post</string>
+	<string name="poi_vacuum_cleaner">Vacuum cleaner store</string>
 	<string name="poi_variety_store">Variety store</string>
-	<string name="poi_video_shop">Video store</string>
-	<string name="poi_window_blind_shop">Window blind store</string>
+	<string name="poi_video">Video store</string>
+	<string name="poi_window_blind">Window blind store</string>
 	<string name="poi_department_store">Department store</string>
-	<string name="poi_electronics_shop">Electronics store</string>
+	<string name="poi_electronics">Electronics store</string>
 	<string name="poi_car">Car shop</string>
 	<string name="poi_car_parts">Car parts</string>
-	<string name="poi_atv_shop">Quad store</string>
-	<string name="poi_cosmetics_shop">Cosmetics</string>
+	<string name="poi_atv">Quad store</string>
+	<string name="poi_cosmetics">Cosmetics</string>
 	<string name="poi_marketplace">Marketplace</string>
-	<string name="poi_sewing_shop">Dry goods store</string>
+	<string name="poi_sewing">Dry goods store</string>
 
 	<string name="poi_police">Police</string>
 	<string name="poi_fire_station">Fire station</string>
@@ -169,7 +169,7 @@
 	<string name="poi_railway_station">Railway station</string>
 	<string name="poi_railway_platform">Railway platform</string>
 	<string name="poi_halt">Railway stop</string>
-	<string name="poi_subway_entrance">Subway entrance</string>
+	<string name="poi_railway_subway_entrance">Subway entrance</string>
 	<string name="poi_subway_station">Subway station</string>
 	<string name="poi_railway_buffer_stop">Railway buffer stop</string>
 	<string name="poi_taxi">Taxi stand</string>
@@ -272,7 +272,7 @@
 	<string name="poi_pension_fund">Pension fund</string>
 	<string name="poi_migration">Migration</string>
 	<string name="poi_tax_inspection">Tax inspection</string>
-	<string name="poi_administrative_office">Administrative office</string>
+	<string name="poi_office_administrative">Administrative office</string>
 	<string name="poi_customs">Customs</string>
 	<string name="poi_city">City</string>
 	<string name="poi_town">Town</string>
@@ -313,14 +313,14 @@
 	<string name="poi_insurance">Insurance</string>
 	<string name="poi_estate_agent">Estate agent</string>
 	<string name="poi_lawyer">Lawyer</string>
-	<string name="poi_telecommunication_office">Telecommunication office</string>
+	<string name="poi_office_telecommunication">Telecommunication office</string>
 	<string name="poi_ngo">NGO</string>
 	<string name="poi_town_hall">Town hall</string>
 	<string name="poi_employment_agency">Employment office</string>
-	<string name="poi_research_office">Research office</string>
-	<string name="poi_it_office">IT office</string>
-	<string name="poi_newspaper_office">Newspaper office</string>
-	<string name="poi_architect_office">Architect office</string>
+	<string name="poi_research">Research office</string>
+	<string name="poi_it">IT office</string>
+	<string name="poi_newspaper">Newspaper office</string>
+	<string name="poi_architect">Architect office</string>
 	<string name="poi_advertising_agency">Advertising agency</string>
 	<string name="poi_educational_institution">Educational institution</string>
 	<string name="poi_studio">Studio</string>
@@ -403,11 +403,11 @@
 	<string name="poi_city_gate">City gate</string>
 	<string name="poi_fort">Fort</string>
 	<string name="poi_fountain">Fountain</string>
-	<string name="poi_ruins_historic">Historic ruins</string>
+	<string name="poi_historic_ruins">Historic ruins</string>
 	<string name="poi_rune_stone">Rune stone</string>
 	<string name="poi_wreck">Shipwreck</string>
-	<string name="poi_ship_historic">Historic ship</string>
-	<string name="poi_mine_historic">Historic mine</string>
+	<string name="poi_historic_ship">Historic ship</string>
+	<string name="poi_historic_mine">Historic mine</string>
 	<string name="poi_monument">Monument</string>
 	<string name="poi_zoo">Zoo</string>
 	<string name="poi_aquarium">Aquarium</string>
@@ -416,7 +416,7 @@
 	<string name="poi_attraction">Tourism attraction</string>
 	<string name="poi_amusement_ride">Amusement ride</string>
 	<string name="poi_attraction_animal">Animal (attraction)</string>
-	<string name="poi_ferris_wheel">Ferris wheel</string>
+	<string name="poi_big_wheel">Ferris wheel</string>
 	<string name="poi_carousel">Carousel</string>
 	<string name="poi_maze">Maze</string>
 	<string name="poi_roller_coaster">Roller coaster</string>
@@ -436,14 +436,14 @@
 	<string name="poi_apartment">Apartment</string>
 
 	<string name="poi_place_of_worship">Place of worship</string>
-	<string name="poi_place_of_worship_christian">Place of worship: christian</string>
-	<string name="poi_place_of_worship_jewish">Place of worship: jewish</string>
-	<string name="poi_place_of_worship_muslim">Place of worship: muslim</string>
-	<string name="poi_place_of_worship_sikh">Place of worship: sikh</string>
-	<string name="poi_place_of_worship_buddhist">Place of worship: buddhist</string>
-	<string name="poi_place_of_worship_hindu">Place of worship: hindu</string>
-	<string name="poi_place_of_worship_shinto">Place of worship: shinto</string>
-	<string name="poi_place_of_worship_taoist">Place of worship: taoist</string>
+	<string name="poi_religion_christian">Place of worship: christian</string>
+	<string name="poi_religion_jewish">Place of worship: jewish</string>
+	<string name="poi_religion_muslim">Place of worship: muslim</string>
+	<string name="poi_religion_sikh">Place of worship: sikh</string>
+	<string name="poi_religion_buddhist">Place of worship: buddhist</string>
+	<string name="poi_religion_hindu">Place of worship: hindu</string>
+	<string name="poi_religion_shinto">Place of worship: shinto</string>
+	<string name="poi_religion_taoist">Place of worship: taoist</string>
 
 	<string name="poi_internet_access_wlan">Internet access: wlan</string>
 	<string name="poi_internet_access_terminal">Internet access: terminal</string>
@@ -455,7 +455,7 @@
 	<string name="poi_historic_monastery">Historic monastery</string>
 	<string name="poi_wayside_cross">Wayside cross</string>
 	<string name="poi_wayside_shrine">Wayside shrine</string>
-	<string name="poi_tourism_information">Tourist information</string>
+	<string name="poi_information">Tourist information</string>
 	<string name="poi_clock">Clock</string>
 	<string name="poi_travel_agent">Travel agent</string>
 	<string name="poi_viewpoint">Viewpoint</string>
@@ -509,7 +509,7 @@
 	<string name="poi_stripclub">Stripclub</string>
 	<string name="poi_beach_resort">Beach resort</string>
 	<string name="poi_dog_park">Dog park</string>
-	<string name="poi_fishing_place">Fishing place</string>
+	<string name="poi_leisure_fishing">Fishing place</string>
 	<string name="poi_hunting_stand">Hunting stand</string>
 	<string name="poi_harbour">Harbor</string>
 	<string name="poi_marina">Marina</string>
@@ -529,58 +529,58 @@
 	<string name="poi_drinking_water">Drinking water</string>
 	<string name="poi_barbecue">Barbecue</string>
 
-	<string name="poi_agricultural_engines_craft">Agricultural engines</string>
-	<string name="poi_basket_maker">Basket maker</string>
-	<string name="poi_beekeeper">Beekeeper</string>
-	<string name="poi_blacksmith">Blacksmith</string>
-	<string name="poi_brewery">Brewery</string>
-	<string name="poi_boatbuilder">Boatbuilder</string>
-	<string name="poi_bookbinder">Bookbinder</string>
-	<string name="poi_carpenter">Carpenter</string>
-	<string name="poi_carpet_layer">Carpet layer</string>
-	<string name="poi_caterer">Caterer</string>
-	<string name="poi_clockmaker">Clockmaker</string>
-	<string name="poi_dressmaker">Dressmaker</string>
-	<string name="poi_electrician">Electrician</string>
-	<string name="poi_gardener">Gardener</string>
-	<string name="poi_glaziery_craft">Glaziery craft</string>
-	<string name="poi_handicraft">Handicraft</string>
-	<string name="poi_hvac">Heating, ventilation, air conditioning</string>
-	<string name="poi_insulation_craft">Insulation</string>
-	<string name="poi_jeweller">Jeweller</string>
-	<string name="poi_locksmith">Locksmith</string>
-	<string name="poi_key_cutter">Key cutter</string>
-	<string name="poi_metal_construction_craft">Metal construction craft</string>
-	<string name="poi_optician">Optician</string>
-	<string name="poi_painter">Painter</string>
-	<string name="poi_parquet_layer">Parquet layer</string>
-	<string name="poi_photographer">Photographer</string>
-	<string name="poi_photographic_laboratory">Photographic laboratory</string>
-	<string name="poi_plasterer">Plasterer</string>
-	<string name="poi_plumber">Plumber</string>
-	<string name="poi_pottery_craft">Pottery craft</string>
-	<string name="poi_rigger">Rigger</string>
-	<string name="poi_roofer">Roofer</string>
-	<string name="poi_saddler">Saddler</string>
-	<string name="poi_sailmaker">Sailmaker</string>
-	<string name="poi_sawmill">Sawmill</string>
-	<string name="poi_scaffolder">Scaffolder</string>
-	<string name="poi_sculptor">Sculptor</string>
-	<string name="poi_shoemaker">Shoemaker</string>
-	<string name="poi_stand_builder">Stand builder</string>
-	<string name="poi_stonemason">Stonemason</string>
-	<string name="poi_sun_protection_craft">Sun protection craft</string>
-	<string name="poi_sweep">Sweep</string>
-	<string name="poi_tailor">Tailor</string>
-	<string name="poi_tiler">Tiler</string>
-	<string name="poi_tinsmith">Tinsmith</string>
-	<string name="poi_upholsterer">Upholsterer</string>
-	<string name="poi_watchmaker">Watchmaker</string>
-	<string name="poi_window_construction">Window construction</string>
+	<string name="poi_craft_agricultural_engines">Agricultural engines</string>
+	<string name="poi_craft_basket_maker">Basket maker</string>
+	<string name="poi_craft_beekeeper">Beekeeper</string>
+	<string name="poi_craft_blacksmith">Blacksmith</string>
+	<string name="poi_craft_brewery">Brewery</string>
+	<string name="poi_craft_boatbuilder">Boatbuilder</string>
+	<string name="poi_craft_bookbinder">Bookbinder</string>
+	<string name="poi_craft_carpenter">Carpenter</string>
+	<string name="poi_craft_carpet_layer">Carpet layer</string>
+	<string name="poi_craft_caterer">Caterer</string>
+	<string name="poi_craft_clockmaker">Clockmaker</string>
+	<string name="poi_craft_dressmaker">Dressmaker</string>
+	<string name="poi_craft_electrician">Electrician</string>
+	<string name="poi_craft_gardener">Gardener</string>
+	<string name="poi_craft_glaziery">Glaziery craft</string>
+	<string name="poi_craft_handicraft">Handicraft</string>
+	<string name="poi_craft_hvac">Heating, ventilation, air conditioning</string>
+	<string name="poi_craft_insulation">Insulation</string>
+	<string name="poi_craft_jeweller">Jeweller</string>
+	<string name="poi_craft_locksmith">Locksmith</string>
+	<string name="poi_craft_key_cutter">Key cutter</string>
+	<string name="poi_craft_metal_construction">Metal construction craft</string>
+	<string name="poi_craft_optician">Optician</string>
+	<string name="poi_craft_painter">Painter</string>
+	<string name="poi_craft_parquet_layer">Parquet layer</string>
+	<string name="poi_craft_photographer">Photographer</string>
+	<string name="poi_craft_photographic_laboratory">Photographic laboratory</string>
+	<string name="poi_craft_plasterer">Plasterer</string>
+	<string name="poi_craft_plumber">Plumber</string>
+	<string name="poi_craft_pottery">Pottery craft</string>
+	<string name="poi_craft_rigger">Rigger</string>
+	<string name="poi_craft_roofer">Roofer</string>
+	<string name="poi_craft_saddler">Saddler</string>
+	<string name="poi_craft_sailmaker">Sailmaker</string>
+	<string name="poi_craft_sawmill">Sawmill</string>
+	<string name="poi_craft_scaffolder">Scaffolder</string>
+	<string name="poi_craft_sculptor">Sculptor</string>
+	<string name="poi_craft_shoemaker">Shoemaker</string>
+	<string name="poi_craft_stand_builder">Stand builder</string>
+	<string name="poi_craft_stonemason">Stonemason</string>
+	<string name="poi_craft_sun_protection">Sun protection craft</string>
+	<string name="poi_craft_sweep">Sweep</string>
+	<string name="poi_craft_tailor">Tailor</string>
+	<string name="poi_craft_tiler">Tiler</string>
+	<string name="poi_craft_tinsmith">Tinsmith</string>
+	<string name="poi_craft_upholsterer">Upholsterer</string>
+	<string name="poi_craft_watchmaker">Watchmaker</string>
+	<string name="poi_craft_window_construction">Window construction</string>
 
 	<string name="poi_funeral_directors">Funeral directors</string>
-	<string name="poi_computer_craft">Computer craft</string>
-	<string name="poi_beauty_salon">Beauty salon</string>
+	<string name="poi_craft_computer">Computer craft</string>
+	<string name="poi_beauty">Beauty salon</string>
 	<string name="poi_beauty_salon_nails">Nail salon</string>
 	<string name="poi_hairdresser">Hairdresser</string>
 	<string name="poi_massage">Massage salon</string>
@@ -604,7 +604,7 @@
 	<string name="poi_pawnbroker">Pawnbroker</string>
 	<string name="poi_currencyexchange">Bureau de change</string>
 	<string name="poi_accountant">Accountant</string>
-	<string name="poi_bitcoin_yes">Bitcoin payment</string>
+	<string name="poi_bitcoin">Bitcoin payment</string>
 
 	<string name="poi_cave_entrance">Cave entrance</string>
 	<string name="poi_peak">Mountain peak</string>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index dc3df34249..c250eb4979 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -47,8 +47,8 @@
 	<dimen name="dashboard_map_bottom_padding">90dp</dimen>
 	<dimen name="dashboard_parking_left_margin">16dp</dimen>
 	<dimen name="dashboard_parking_icon_size">48dp</dimen>
+	<dimen name="osmo_header_height">56dp</dimen>
 	<!--  map buttons -->
-	
 	<dimen name="map_trans_seek_size">80dp</dimen>
 	<dimen name="map_widget_text_size">20sp</dimen>
 	<dimen name="map_widget_text_size_small">14sp</dimen>
@@ -69,8 +69,6 @@
 	<dimen name="map_button_inset">4dp</dimen>
 	<dimen name="map_button_rect_rad">3dp</dimen>
 	<dimen name="map_button_stroke">1px</dimen>
-	
-
 
     <!-- TextSizes -->
 	<dimen name="list_header_text_size">14sp</dimen>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0dd37df103..e15371ea19 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="delay_to_start_navigation_descr">Automatically start navigation after specified interval</string>
     <string name="delay_to_start_navigation">Skip route planning</string>
     <string name="shared_string_go">Go</string>
+	<string name="osmand_parking_outdated">Outdated</string>
 	<string name="action_create">Action create</string>
 	<string name="action_modify">Action modify</string>
 	<string name="action_delete">Action delete</string>
@@ -113,10 +114,10 @@
 		\n\nRecorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitor their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be analyzed in special 3rd party analysis tools.
 	</string>
 	<string name="osmo_plugin_name">OsMo monitoring</string>
-	<string name="osmo_plugin_description">Shows the settings to use OsMo advanced live monitoring, see http://osmo.mobi. Track other devices and be tracked. 
-		Create anonymous groups, share each other\'s location, and communicate. Has various settings for session tracking or permanent tracking.
-		\n\nAnonymous groups are limited for a number of days and for some feature, i.e. there is no remote control and group administrator. 
-		Fully functional groups should be created on the website and only registered users have access to them.
+	<string name="osmo_plugin_description">This Plugin provides the functionality for OsMo advanced live monitoring, see http://osmo.mobi.
+		\n\nYou can track other devices and be tracked. You can spontaneoulsy  create anonymous groups, share each other\'s location, and communicate. Comes with various options for session tracking or permanent tracking.
+		\n\nAnonymous groups are created for a specified number of days and limited to defined features, i.e. there is no remote control and no group administrator. 
+		Fully functional groups, on the other hand, can be created on the website and only registered users have access to them.
 	</string>
 	<string name="srtm_paid_version_title">Contour lines plugin</string>
 	<string name="osmand_srtm_short_description_80_chars">OsmAnd plugin for offline contour lines</string>
@@ -146,18 +147,17 @@
 		\n\nActivating this view changes the map style to \'Winter and ski\', showing all landscape features under wintery conditions. This view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.
 	</string>
 	<string name="audionotes_plugin_name">Audio/video notes</string>
-	<string name="audionotes_plugin_description">This plugin provides the functionality and buttons to take audio/photography/video notes during a trip</string>
+	<string name="audionotes_plugin_description">The Audio/video notes plugin provides the functionality to take audio/photography/video notes during a trip, using either a button on the map screen, or directly the context menu for any position on the map.</string>
 	<string name="osmand_parking_plugin_name">Parking Position</string>
 	<string name="osmand_parking_plugin_description">This plugin was developed to use OsmAnd to easily memorize the location of your parked car.</string>
 	<string name="osmand_distance_planning_plugin_name">Distance calculator &amp; planning tool</string>
 	<string name="osmand_distance_planning_plugin_description">This plugin provides a map screen widget allowing to create paths by tapping on the map, or use or modify existing GPX files, to plan a trip and measure the distance between points. The results can be saved as a GPX file, which can later be used for guidance.</string>
 	<string name="accessibility_preferences">Accessibility</string>
-	<string name="osmand_accessibility_description">Shows the settings to activate special accessibility features.</string>
+	<string name="osmand_accessibility_description">This plugin makes a device\'s acessibility features available directly in OsmAnd, and facilitates e.g. adjusting the speech rate for TTS voices, configuring directional-pad screen navigation, using a trackball for zoom control, or using text-to-speech feedback.</string>
 	<string name="osm_settings">OSM editing</string>
-	<string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM bugs, and contributing recorded GPX files. Using this functionality requires personal OSM credentials.</string>
-	<string name="osmand_development_plugin_description">Shows the settings for development and debugging features like route simulation or rendering performance indication.</string>
+	<string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM bugs, and contributing recorded GPX files. OSM is a community driven, global public domain mapping project. For details please refer to http://openstreetmap.org. Active participation is appreciated, and contributions can be made directly from OsmAnd, if you specify your personal OSM credentials in the app.</string>
+	<string name="osmand_development_plugin_description">This plugin displays settings for development and debugging features like to test or simulate routing, the screen rendering performance, or voice prompting. These settings are intended for developers and are not needed for the general user.</string>
 	<string name="debugging_and_development">OsmAnd development</string>
-
 	<string name="rename_failed">Rename failed.</string>
 	<string name="days_behind">days behind</string>
 	<string name="back_to_map">Back to map</string>
@@ -1942,7 +1942,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="search_online_address">Online search</string>
 	<string name="max_level_download_tile">Max. online zoom</string>
 	<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
-	<string name="route_general_information">Total distance %1$s \n travelling time %2$d h %3$d m.</string>
+	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
 	<string name="router_service_descr">Choose an online or offline navigation service</string>
 	<string name="router_service">Navigation service</string>
 	<string name="sd_dir_not_accessible">The data storage folder on the SD card is not accessible!</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 9a61d1c1c5..e6a3040b71 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -165,7 +165,8 @@
 		<item name="expandable_list_background">@color/color_white</item>
 		<item name="list_settings_icon">@drawable/ic_overflow_menu_light</item>
 		<item name="size_progress_bar">@drawable/size_progressbar_light</item>
-		<item name="dash_parking_bg">@color/dashboard_blue</item>
+		<item name="dash_parking_bg">@drawable/dash_parking_light</item>
+		<item name="osmo_header_background">@color/osmo_header_light</item>
 	</style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -209,7 +210,8 @@
 		<item name="expandable_list_background">@color/list_background_dark</item>
 		<item name="list_settings_icon">@drawable/ic_overflow_menu_dark</item>
 		<item name="size_progress_bar">@drawable/size_progressbar_dark</item>
-		<item name="dash_parking_bg">@color/dashboard_parking_dark</item>
+		<item name="dash_parking_bg">@drawable/dash_parking_dark</item>
+		<item name="osmo_header_background">@color/osmo_header_dark</item>
 	</style>
 
     <style name="Widget.Styled.ActionBarDark" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java
index edd7c33250..9082f007ed 100644
--- a/OsmAnd/src/net/osmand/data/PointDescription.java
+++ b/OsmAnd/src/net/osmand/data/PointDescription.java
@@ -32,6 +32,7 @@ public class PointDescription {
 	public static final String POINT_TYPE_LOCATION = "location";
 	public static final String POINT_TYPE_ALARM = "alarm";
 	public static final String POINT_TYPE_TARGET = "destination";
+	public static final String POINT_TYPE_OSM_BUG = "bug";
 	
 
 	public static final PointDescription LOCATION_POINT = new PointDescription(POINT_TYPE_LOCATION, "");
diff --git a/OsmAnd/src/net/osmand/plus/IconsCache.java b/OsmAnd/src/net/osmand/plus/IconsCache.java
index e41a6b7f2e..56859e2713 100644
--- a/OsmAnd/src/net/osmand/plus/IconsCache.java
+++ b/OsmAnd/src/net/osmand/plus/IconsCache.java
@@ -39,7 +39,8 @@ public class IconsCache {
 	public Drawable getIcon(int id, int colorId) {
 		return getDrawable(id, colorId);
 	}
-	
+
+
 	public Drawable getContentIcon(int id) {
 		return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color_light : 0);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarProgressActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarProgressActivity.java
index 42b47ba37f..0206be4177 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ActionBarProgressActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarProgressActivity.java
@@ -1,9 +1,12 @@
 package net.osmand.plus.activities;
 
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.ProgressBar;
 
+import net.osmand.plus.R;
+
 /**
  * Created by Denis
  * on 23.01.15.
@@ -29,4 +32,23 @@ public class ActionBarProgressActivity extends OsmandActionBarActivity {
     public void setSupportProgressBarIndeterminateVisibility(boolean visible) {
         getSupportActionBar().getCustomView().setVisibility(visible ? View.VISIBLE : View.GONE);
     }
+
+	public Toolbar getClearToolbar(boolean visible) {
+		final Toolbar tb = (Toolbar) findViewById(R.id.bottomControls);
+		if (tb == null) {
+			return null;
+		}
+		tb.setTitle(null);
+		tb.getMenu().clear();
+		tb.setVisibility(visible? View.VISIBLE : View.GONE);
+		return tb;
+	}
+
+	public void setToolbarVisibility(boolean visible){
+		View toolbar = findViewById(R.id.bottomControls);
+		if (toolbar != null) {
+			toolbar.setVisibility(visible? View.VISIBLE : View.GONE);
+		}
+
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index bf6bba6be8..5da20acc5b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -18,7 +18,6 @@ import net.osmand.plus.dashboard.NotifyingScrollView;
 import net.osmand.plus.download.BaseDownloadActivity;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.sherpafy.TourViewActivity;
-import net.osmand.plus.views.controls.FloatingActionButton;
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -53,7 +52,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 	int defaultMargin;
 
 	private Drawable actionBarBackground;
-	FloatingActionButton fabButton;
 
 	private NotifyingScrollView.OnScrollChangedListener onScrollChangedListener = new NotifyingScrollView.OnScrollChangedListener() {
 		public void onScrollChanged(ScrollView who, int l, int t, int oldl, int oldt) {
@@ -69,18 +67,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 					margintop,
 					r.getDisplayMetrics());
 			int margin = px + defaultMargin;
-			if (headerHeight < t - margin){
-				//hiding action bar - showing floating button
-				//getSupportActionBar().hide();
-				if (fabButton != null) {
-					fabButton.showFloatingActionButton();
-				}
-			} else {
-				//getSupportActionBar().show();
-				if (fabButton != null) {
-					fabButton.hideFloatingActionButton();
-				}
-
+			if (headerHeight >= t - margin){
 				//makes other cards to move on top of the map card to make it look like android animations
 				View fragments = findViewById(R.id.fragments);
 				LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -158,22 +145,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 			startMapActivity();
 		}
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-			fabButton = new FloatingActionButton.Builder(this)
-					.withDrawable(getResources().getDrawable(R.drawable.ic_action_map))
-					.withButtonColor(Color.parseColor("#ff8f00"))
-					.withGravity(Gravity.BOTTOM | Gravity.RIGHT)
-					.withMargins(0, 0, 16, 16)
-					.create();
-			fabButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					startMapActivity();
-				}
-			});
-			fabButton.hideFloatingActionButton();
-		}
-
 		getLocationProvider().addCompassListener(this);
 		getLocationProvider().registerOrUnregisterCompassListener(true);
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 24fc1c2e80..cb20ffabbb 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -134,20 +134,17 @@ public class MapActivity extends AccessibleActivity {
 		// Full screen is not used here
 		// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		setContentView(R.layout.main);
+		
+		mapView = new OsmandMapTileView();
+		mapView.init(this);
 		mapActions = new MapActivityActions(this);
 		mapLayers = new MapActivityLayers(this);
 		if (mapViewTrackingUtilities == null) {
 			mapViewTrackingUtilities = new MapViewTrackingUtilities(app);
 		}
-
 		dashboardOnMap.createDashboardView();
 		checkAppInitialization();
 		parseLaunchIntentLocation();
-
-		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
-		surf.setVisibility(View.VISIBLE);
-		mapView = surf.getMapView();
-
 		mapView.setTrackBallDelegate(new OsmandMapTileView.OnTrackBallListener() {
 			@Override
 			public boolean onTrackBallEvent(MotionEvent e) {
@@ -212,7 +209,7 @@ public class MapActivity extends AccessibleActivity {
 						((TextView) findViewById(R.id.ProgressMessage)).setText(tn);
 					}
 					if(event == InitEvents.NATIVE_INITIALIZED) {
-						setupOpenGLView();
+						setupOpenGLView(false);
 						openGlSetup = true;
 					}
 					if(event == InitEvents.MAPS_INITIALIZED) {
@@ -223,7 +220,7 @@ public class MapActivity extends AccessibleActivity {
 				@Override
 				public void onFinish(AppInitializer init) {
 					if(!openGlSetup) {
-						setupOpenGLView();
+						setupOpenGLView(false);
 					}
 					mapView.refreshMap(true);
 					findViewById(R.id.init_progress).setVisibility(View.GONE);
@@ -232,12 +229,12 @@ public class MapActivity extends AccessibleActivity {
 			};
 			getMyApplication().checkApplicationIsBeingInitialized(this, initListener);
 		} else {
-			setupOpenGLView();
+			setupOpenGLView(true);
 		}
 	}
 
 	
-	private void setupOpenGLView() {
+	private void setupOpenGLView(boolean init) {
 		if (settings.USE_OPENGL_RENDER.get() && NativeCoreContext.isInit()) {
 			ViewStub stub = (ViewStub) findViewById(R.id.atlasMapRendererViewStub);
 			atlasMapRendererView = (AtlasMapRendererView) stub.inflate();
@@ -246,11 +243,15 @@ public class MapActivity extends AccessibleActivity {
 			atlasMapRendererView.setAzimuth(0);
 			atlasMapRendererView.setElevationAngle(90);
 			NativeCoreContext.getMapRendererContext().setMapRendererView(atlasMapRendererView);
-			mapView = ml.getMapView();
+			ml.setMapView(mapView);
 			mapViewTrackingUtilities.setMapView(mapView);
 			mapView.setMapRender(atlasMapRendererView);
 			OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
 			surf.setVisibility(View.GONE);
+		} else if(init) {
+			OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
+			surf.setVisibility(View.VISIBLE);
+			surf.setMapView(mapView);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java
index 27b3651c0a..2dacca94b3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java
@@ -6,7 +6,9 @@ import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ExpandableListView;
+
 import net.osmand.plus.OsmandApplication;
+
 import android.app.ActionBar;
 import android.graphics.Shader.TileMode;
 import android.graphics.drawable.BitmapDrawable;
@@ -17,7 +19,7 @@ import android.view.View;
 
 public abstract class OsmandExpandableListActivity extends
 		ActionBarProgressActivity {
-	
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		((OsmandApplication) getApplication()).applyTheme(this);
@@ -27,22 +29,22 @@ public abstract class OsmandExpandableListActivity extends
 
 
 	public OsmandApplication getMyApplication() {
-		return (OsmandApplication)getApplication();
+		return (OsmandApplication) getApplication();
 	}
-	
+
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		int itemId = item.getItemId();
 		switch (itemId) {
-		case android.R.id.home:
-			finish();
-			return true;
+			case android.R.id.home:
+				finish();
+				return true;
 
 		}
 		return false;
 	}
-	
+
 	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) {
 		int r = isLightActionBar() ? iconLight : iconDark;
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
@@ -58,7 +60,11 @@ public abstract class OsmandExpandableListActivity extends
 		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
 		return menuItem;
 	}
-	
+
+	public MenuItem createMenuItem(Menu m, int id, int titleRes, int icon, int menuItemType) {
+		return createMenuItem(m, id, titleRes, icon, icon, menuItemType);
+	}
+
 	public void fixBackgroundRepeat(View view) {
 		Drawable bg = view.getBackground();
 		if (bg != null) {
@@ -69,18 +75,18 @@ public abstract class OsmandExpandableListActivity extends
 			}
 		}
 	}
-	
 
-	public void setListAdapter(OsmandBaseExpandableListAdapter adapter){
-		((ExpandableListView)findViewById(android.R.id.list)).setAdapter(adapter);
+
+	public void setListAdapter(OsmandBaseExpandableListAdapter adapter) {
+		((ExpandableListView) findViewById(android.R.id.list)).setAdapter(adapter);
 	}
 
 	public ExpandableListView getExpandableListView() {
-		return (ExpandableListView)findViewById(android.R.id.list);
+		return (ExpandableListView) findViewById(android.R.id.list);
 	}
 
-	public void setOnChildClickListener(ExpandableListView.OnChildClickListener childClickListener){
-		((ExpandableListView)findViewById(android.R.id.list)).setOnChildClickListener(childClickListener);
+	public void setOnChildClickListener(ExpandableListView.OnChildClickListener childClickListener) {
+		((ExpandableListView) findViewById(android.R.id.list)).setOnChildClickListener(childClickListener);
 	}
 
 	public boolean isLightActionBar() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
index 005688264a..8b528802e2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
@@ -148,10 +148,11 @@ public class SearchPoiFilterFragment extends ListFragment implements SearchActiv
 			}
 			TextView label = (TextView) row.findViewById(R.id.folder_label);
 			ImageView icon = (ImageView) row.findViewById(R.id.folder_icon);
+			OsmandApplication app = getMyApplication();
 			final PoiLegacyFilter model = getItem(position);
 			label.setText(model.getName());
 			if(model.getFilterId().equals(PoiLegacyFilter.CUSTOM_FILTER_ID)) {
-				icon.setImageResource(android.R.drawable.ic_input_get);
+				icon.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_filter_dark));
 			} else if (model.getFilterId().equals(PoiLegacyFilter.BY_NAME_FILTER_ID)) {
 				icon.setImageResource(android.R.drawable.ic_search_category_default);
 			} else {
@@ -191,4 +192,8 @@ public class SearchPoiFilterFragment extends ListFragment implements SearchActiv
 	public void locationUpdate(LatLon l) {
 	}
 
+	public OsmandApplication getMyApplication() {
+		return (OsmandApplication) getActivity().getApplication();
+	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 12de9be350..758964d1e1 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.osmand.data.PointDescription;
+import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
@@ -45,13 +46,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				Activity activity = getActivity();
-				Class<FavoritesActivity> fa = getMyApplication().getAppCustomization().getFavoritesActivity();
-				final Intent favorites = new Intent(activity, fa);
-				favorites.putExtra("TAB", "AUDIO");
-				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.NOTES_TAB);
-				activity.startActivity(favorites);
+				startFavoritesActivity(FavoritesActivity.NOTES_TAB);
 			}
 		});
 		return view;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
index 805c34e466..21aaa81a10 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
@@ -1,10 +1,14 @@
 package net.osmand.plus.dashboard;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.location.Location;
 import android.support.v4.app.Fragment;
+
+import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.myplaces.FavoritesActivity;
 
 /**
  * Created by Denis on 24.11.2014.
@@ -63,4 +67,13 @@ public abstract class DashBaseFragment extends Fragment {
 		}
 	}
 
+	protected void startFavoritesActivity(int tab) {
+		Activity activity = getActivity();
+		OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+		favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+		getMyApplication().getSettings().FAVORITES_TAB.set(tab);
+		activity.startActivity(favorites);
+	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 664eb2c241..489c405c07 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -31,7 +31,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 /**
- * Created by Denis on 24.11.2014.
+ * Created by Denis
+ * on 24.11.2014.
  */
 public class DashFavoritesFragment extends DashLocationFragment {
 	public static final String TAG = "DASH_FAVORITES_FRAGMENT";
@@ -47,12 +48,7 @@ public class DashFavoritesFragment extends DashLocationFragment {
 		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				Activity activity = getActivity();
-				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
-				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
-				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.FAVORITES_TAB);
-				activity.startActivity(favorites);
+				startFavoritesActivity(FavoritesActivity.FAVORITES_TAB);
 			}
 		});
 		return view;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
index 4e40b1f4cd..115b203f94 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
@@ -9,6 +9,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.views.DirectionDrawable;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -31,34 +32,34 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 	private static final int ORIENTATION_180 = 2;
 	protected List<DashLocationView> distances = new ArrayList<DashLocationFragment.DashLocationView>();
 	private int screenOrientation;
-	
+
 	public static class DashLocationView {
 		public ImageView arrow;
 		public TextView txt;
 		public LatLon loc;
 		public int arrowResId;
-		
+		public boolean paint = true;
+
 		public DashLocationView(ImageView arrow, TextView txt, LatLon loc) {
 			super();
 			this.arrow = arrow;
 			this.txt = txt;
 			this.loc = loc;
 		}
-		
-		
+
+
 	}
 
-	
+
 	@Override
 	public void onOpenDash() {
 		//Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation
-		screenOrientation = getScreenOrientation(getActivity());		
+		screenOrientation = getScreenOrientation(getActivity());
 	}
 
 	public static int getScreenOrientation(Activity a) {
 		int screenOrientation = ((WindowManager) a.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
-		switch (screenOrientation)
-		{
+		switch (screenOrientation) {
 			case ORIENTATION_0:   // Device default (normally portrait)
 				screenOrientation = 0;
 				break;
@@ -73,16 +74,16 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 				break;
 		}
 		//Looks like screenOrientation correction must not be applied for devices without compass?
-		Sensor compass  = ((SensorManager) a.getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+		Sensor compass = ((SensorManager) a.getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
 		if (compass == null) {
 			screenOrientation = 0;
 		}
 		return screenOrientation;
 	}
-	
+
 	public LatLon getDefaultLocation() {
 		DashboardOnMap d = dashboard;
-		if(d == null) {
+		if (d == null) {
 			return null;
 		}
 		return d.getMapViewLocation();
@@ -90,7 +91,7 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 
 	public void updateAllWidgets() {
 		DashboardOnMap d = dashboard;
-		if(d == null) {
+		if (d == null) {
 			return;
 		}
 		float head = d.getHeading();
@@ -103,19 +104,20 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 		LatLon loc = (useCenter ? mw : myLoc);
 		float h = useCenter ? -mapRotation : head;
 		for (DashLocationView lv : distances) {
-			updateLocationView(useCenter, loc, h, lv.arrow, lv.arrowResId, lv.txt, lv.loc.getLatitude(), lv.loc.getLongitude(), 
-					screenOrientation, getMyApplication(), getActivity());
+			updateLocationView(useCenter, loc, h, lv.arrow, lv.arrowResId, lv.txt, lv.loc.getLatitude(), lv.loc.getLongitude(),
+					screenOrientation, getMyApplication(), getActivity(), lv.paint);
 		}
 	}
 
-	public static void updateLocationView(boolean useCenter, LatLon fromLoc, Float h, 
-			ImageView arrow, TextView txt, double toLat, double toLon,
-			int screenOrientation, OsmandApplication app, Context ctx) {
-		updateLocationView(useCenter, fromLoc, h, arrow, 0, txt, toLat, toLon, screenOrientation, app, ctx);
+	public static void updateLocationView(boolean useCenter, LatLon fromLoc, Float h,
+										  ImageView arrow, TextView txt, double toLat, double toLon,
+										  int screenOrientation, OsmandApplication app, Context ctx) {
+		updateLocationView(useCenter, fromLoc, h, arrow, 0, txt, toLat, toLon, screenOrientation, app, ctx, true);
 	}
-	public static void updateLocationView(boolean useCenter, LatLon fromLoc, Float h, 
-			ImageView arrow, int arrowResId, TextView txt, double toLat, double toLon, 
- int screenOrientation, OsmandApplication app, Context ctx) {
+
+	public static void updateLocationView(boolean useCenter, LatLon fromLoc, Float h,
+										  ImageView arrow, int arrowResId, TextView txt, double toLat, double toLon,
+										  int screenOrientation, OsmandApplication app, Context ctx, boolean paint) {
 		float[] mes = new float[2];
 		if (fromLoc != null) {
 			Location.distanceBetween(toLat, toLon, fromLoc.getLatitude(), fromLoc.getLongitude(), mes);
@@ -129,7 +131,11 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 				arrowResId = R.drawable.ic_destination_arrow_white;
 			}
 			DirectionDrawable dd = (DirectionDrawable) arrow.getDrawable();
-			dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_myloc_distance);
+			if (paint) {
+				dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_myloc_distance);
+			} else {
+				dd.setImage(arrowResId);
+			}
 			if (fromLoc == null || h == null) {
 				dd.setAngle(0);
 			} else {
@@ -139,8 +145,10 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 		}
 		if (txt != null) {
 			if (fromLoc != null) {
-				txt.setTextColor(app.getResources().getColor(
-						useCenter ? R.color.color_distance : R.color.color_myloc_distance));
+				if (paint) {
+					txt.setTextColor(app.getResources().getColor(
+							useCenter ? R.color.color_distance : R.color.color_myloc_distance));
+				}
 				txt.setText(OsmAndFormatter.getFormattedDistance(mes[0], app));
 			} else {
 				txt.setText("");
@@ -149,7 +157,7 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 	}
 
 	public void updateLocation(boolean centerChanged, boolean locationChanged, boolean compassChanged) {
-		if(compassChanged && !dashboard.isMapLinkedToLocation()) {
+		if (compassChanged && !dashboard.isMapLinkedToLocation()) {
 			return;
 		}
 		updateAllWidgets();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 3388e9e0c7..49a97706d3 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -1,33 +1,13 @@
 package net.osmand.plus.dashboard;
 
-import java.lang.ref.WeakReference;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import net.osmand.data.LatLon;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.audionotes.DashAudioVideoNotesFragment;
-import net.osmand.plus.development.DashSimulateFragment;
-import net.osmand.plus.development.OsmandDevelopmentPlugin;
-import net.osmand.plus.download.DownloadActivity;
-import net.osmand.plus.helpers.ScreenOrientationHelper;
-import net.osmand.plus.monitoring.DashTrackFragment;
-import net.osmand.plus.parkingpoint.DashParkingFragment;
-import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.DownloadedRegionsLayer;
-import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.controls.FloatingActionButton;
+import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.widget.Toolbar;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -41,6 +21,30 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ScrollView;
 
+import com.software.shell.fab.ActionButton;
+
+import net.osmand.data.LatLon;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.audionotes.DashAudioVideoNotesFragment;
+import net.osmand.plus.development.DashSimulateFragment;
+import net.osmand.plus.development.OsmandDevelopmentPlugin;
+import net.osmand.plus.download.DownloadActivity;
+import net.osmand.plus.helpers.ScreenOrientationHelper;
+import net.osmand.plus.monitoring.DashTrackFragment;
+import net.osmand.plus.osmo.DashOsmoFragment;
+import net.osmand.plus.parkingpoint.DashParkingFragment;
+import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.views.DownloadedRegionsLayer;
+import net.osmand.plus.views.OsmandMapTileView;
+
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Created by Denis
  * on 03.03.15.
@@ -53,8 +57,7 @@ public class DashboardOnMap {
 	private static final int CONFIGURE_SCREEN_ID = 3;
 	private static final int SETTINGS_ID = 4;
 	private MapActivity mapActivity;
-	FloatingActionButton fabButton;
-	boolean floatingButtonVisible = true;
+	private ActionButton actionButton;
 	private FrameLayout dashboardView;
 	
 	private boolean visible = false;
@@ -102,29 +105,29 @@ public class DashboardOnMap {
 				mapActivity.getMapActions().toggleDrawer();				
 			}
 		});
-		
-		
-		
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-			fabButton = new FloatingActionButton.Builder(mapActivity)
-					.withDrawable(mapActivity.getResources().getDrawable(R.drawable.ic_action_get_my_location))
-					.withButtonColor(mapActivity.getResources().getColor(R.color.color_myloc_distance))
-					.withGravity(landscape ? Gravity.BOTTOM | Gravity.RIGHT : Gravity.TOP | Gravity.RIGHT)
-					.withMargins(0, landscape ? 0 : 160, 16, landscape ? 16 : 0).create();
-			fabButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					if (getMyApplication().accessibilityEnabled()) {
-						mapActivity.getMapActions().whereAmIDialog();
-					} else {
-						mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
-					}
-					setDashboardVisibility(false);
+		actionButton = new ActionButton(mapActivity);
+		FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		int marginRight = convertPixelsToDp(16, mapActivity);
+		params.setMargins(0, landscape ? 0 : convertPixelsToDp(164, mapActivity), marginRight, landscape ? marginRight : 0);
+
+		params.gravity = landscape ? Gravity.BOTTOM | Gravity.RIGHT : Gravity.TOP | Gravity.RIGHT;
+		actionButton.setLayoutParams(params);
+		actionButton.setImageDrawable(mapActivity.getResources().getDrawable(R.drawable.ic_action_map));
+		actionButton.setButtonColor(mapActivity.getResources().getColor(R.color.color_myloc_distance));
+		actionButton.hide();
+		actionButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (getMyApplication().accessibilityEnabled()) {
+					mapActivity.getMapActions().whereAmIDialog();
+				} else {
+					mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
 				}
-			});
-			fabButton.hideFloatingActionButton();
-		}
+				setDashboardVisibility(false);
+			}
+		});
+		dashboardView.addView(actionButton);
 
 		if (ScreenOrientationHelper.isOrientationPortrait(mapActivity)) {
 			((NotifyingScrollView) dashboardView.findViewById(R.id.main_scroll))
@@ -132,6 +135,11 @@ public class DashboardOnMap {
 		}
 
 	}
+
+	public static int convertPixelsToDp(float dp, Context context){
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
+	}
 	
 	public net.osmand.Location getMyLocation() {
 		return myLocation;
@@ -170,7 +178,8 @@ public class DashboardOnMap {
 			setupActionBar();
 			updateDownloadBtn();
 			dashboardView.setVisibility(View.VISIBLE);
-			fabButton.showFloatingActionButton();
+			actionButton.show();
+			//fabButton.showFloatingActionButton();
 			open(dashboardView.findViewById(R.id.animateContent));
 			switchButton.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.ic_navigation_drawer,
 					R.color.icon_color_light));
@@ -184,7 +193,7 @@ public class DashboardOnMap {
 			mapActivity.getMapViewTrackingUtilities().setDashboard(null);
 			hide(dashboardView.findViewById(R.id.animateContent));
 			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
-			fabButton.hideFloatingActionButton();
+			actionButton.hide();
 			for (WeakReference<DashBaseFragment> df : fragList) {
 				if (df.get() != null) {
 					df.get().onCloseDash();
@@ -356,6 +365,8 @@ public class DashboardOnMap {
 		showFragment(manager, fragmentTransaction, DashFavoritesFragment.TAG, DashFavoritesFragment.class);
 		showFragment(manager, fragmentTransaction, DashAudioVideoNotesFragment.TAG, DashAudioVideoNotesFragment.class);
 		showFragment(manager, fragmentTransaction, DashTrackFragment.TAG, DashTrackFragment.class);
+		showFragment(manager, fragmentTransaction, DashOsmoFragment.TAG, DashOsmoFragment.class);
+		//showFragment(manager, fragmentTransaction, DashOsmEditsFragment.TAG, DashOsmEditsFragment.class);
 //		showFragment(manager, fragmentTransaction, DashUpdatesFragment.TAG, DashUpdatesFragment.class);
 		showFragment(manager, fragmentTransaction, DashPluginsFragment.TAG, DashPluginsFragment.class);
 		
@@ -391,9 +402,9 @@ public class DashboardOnMap {
 		public void onScrollChanged(ScrollView who, int l, int t, int oldl, int oldt) {
 			int sy = who.getScrollY();
 			double scale = who.getContext().getResources().getDisplayMetrics().density;
-			FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) fabButton.getLayoutParams();
+			FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) actionButton.getLayoutParams();
 			lp.topMargin = (int) Math.max(30 * scale, 160 * scale - sy);
-			((FrameLayout) fabButton.getParent()).updateViewLayout(fabButton, lp);
+			((FrameLayout) actionButton.getParent()).updateViewLayout(actionButton, lp);
 		}
 	};
 	
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 14722aae88..83510a12e1 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -1,45 +1,5 @@
 package net.osmand.plus.myplaces;
 
-import java.io.File;
-import java.text.Collator;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import net.osmand.IndexConstants;
-import net.osmand.access.AccessibleToast;
-import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
-import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.GPXUtilities.GPXFile;
-import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
-import net.osmand.plus.GPXUtilities.WptPt;
-import net.osmand.plus.GpxSelectionHelper;
-import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
-import net.osmand.plus.activities.OsmandExpandableListFragment;
-import net.osmand.plus.activities.SavingTrackHelper;
-import net.osmand.plus.activities.TrackActivity;
-import net.osmand.plus.dialogs.DirectionsDialogs;
-import net.osmand.plus.download.LocalIndexesFragment;
-import net.osmand.plus.helpers.ScreenOrientationHelper;
-import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
-import net.osmand.plus.osmedit.OsmEditingPlugin;
-import net.osmand.util.Algorithms;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -77,6 +37,47 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.osmand.IndexConstants;
+import net.osmand.access.AccessibleToast;
+import net.osmand.plus.ContextMenuAdapter;
+import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
+import net.osmand.plus.activities.OsmandExpandableListFragment;
+import net.osmand.plus.activities.SavingTrackHelper;
+import net.osmand.plus.activities.TrackActivity;
+import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.download.LocalIndexesFragment;
+import net.osmand.plus.helpers.ScreenOrientationHelper;
+import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.osmedit.OsmEditingPlugin;
+import net.osmand.util.Algorithms;
+
+import java.io.File;
+import java.text.Collator;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
 public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	public static final int SEARCH_ID = -1;
@@ -349,12 +350,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				return true;
 			}
 		};
-		optionsMenuAdapter.item(R.string.shared_string_show_on_map).icons(R.drawable.ic_show_on_map, R.drawable.ic_show_on_map)
+		optionsMenuAdapter.item(R.string.shared_string_show_on_map).icon(R.drawable.ic_show_on_map)
 				.listen(listener).reg();
 		optionsMenuAdapter.item(R.string.shared_string_delete)
-				.icons(R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark).listen(listener).reg();
+				.icon(R.drawable.ic_action_delete_dark).listen(listener).reg();
 		optionsMenuAdapter.item(R.string.local_index_mi_reload)
-				.icons(R.drawable.ic_action_refresh_dark, R.drawable.ic_action_refresh_dark).listen(listener).reg();
+				.icon(R.drawable.ic_action_refresh_dark).listen(listener).reg();
 		OsmandPlugin.onOptionsMenuActivity(getActivity(), this, optionsMenuAdapter);
 		for (int j = 0; j < optionsMenuAdapter.length(); j++) {
 			final MenuItem item;
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
index cadb37ea1c..d884d27a5a 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
@@ -16,6 +16,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.FavoritesTreeFragment;
 import net.osmand.plus.activities.TabActivity;
 import net.osmand.plus.myplaces.AvailableGPXFragment;
+import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
@@ -73,7 +74,6 @@ public class FavoritesActivity extends TabActivity {
 		ViewPager mViewPager = (ViewPager) findViewById(R.id.pager);
 
 		List<TabItem> mTabs = new ArrayList<TabItem>();
-//		mTabs.add(new TabItem("\t\t\t", FavoritesTreeFragment.class));
 		mTabs.add(getTabIndicator(R.string.shared_string_my_favorites, FavoritesTreeFragment.class));
 		if (hasGpx) {
 			mTabs.add(getTabIndicator(R.string.shared_string_my_tracks, AvailableGPXFragment.class));
@@ -82,9 +82,14 @@ public class FavoritesActivity extends TabActivity {
 		
 		Integer tab = settings.FAVORITES_TAB.get();
 		if (tab == NOTES_TAB) {
-			tab = mTabs.size() -1;
+			if (OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class) != null){
+				tab = mTabs.size() - 2;
+			} else {
+				tab = mTabs.size() - 1;
+			}
+
 		} else if (tab == OSM_EDITS_TAB) {
-			//TODO implement method of counting position for other plugins
+			tab = mTabs.size() - 1;
 		}
 		
 		setViewPagerAdapter(mViewPager, mTabs);
@@ -93,7 +98,7 @@ public class FavoritesActivity extends TabActivity {
 		if (tab > mTabs.size() - 1){
 			tab = 0;
 		}
-		mViewPager.setCurrentItem(tab );
+		mViewPager.setCurrentItem(tab);
 		// setupHomeButton();
 	}
 
@@ -122,18 +127,6 @@ public class FavoritesActivity extends TabActivity {
 	}
 
 
-	public Toolbar getClearToolbar(boolean visible) {
-		final Toolbar tb = (Toolbar) findViewById(R.id.bottomControls);
-		tb.setTitle(null);
-		tb.getMenu().clear();
-		tb.setVisibility(visible? View.VISIBLE : View.GONE);
-		return tb;
-	}
-
-	public void setToolbarVisibility(boolean visible){
-		findViewById(R.id.bottomControls).setVisibility(visible? View.VISIBLE : View.GONE);
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		int itemId = item.getItemId();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
index c92065fd5d..54b98eef4c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
@@ -1,22 +1,38 @@
 package net.osmand.plus.osmedit;
 
+import net.osmand.data.PointDescription;
+import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashBaseFragment;
 import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.myplaces.FavoritesActivity;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by Denis
  * on 20.01.2015.
  */
-public class DashOsmEditsFragment extends DashBaseFragment {
+public class DashOsmEditsFragment extends DashBaseFragment implements OsmEditsUploadListener {
+	public static final String TAG = "DASH_OSM_EDITS_FRAGMENT";
+
 	OsmEditingPlugin plugin;
 
 	@Override
@@ -31,6 +47,12 @@ public class DashOsmEditsFragment extends DashBaseFragment {
 		Button manage = ((Button) view.findViewById(R.id.show_all));
 		manage.setTypeface(typeface);
 		manage.setText(R.string.osm_editing_manage);
+		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				startFavoritesActivity(FavoritesActivity.OSM_EDITS_TAB);
+			}
+		});
 
 		return view;
 	}
@@ -44,12 +66,113 @@ public class DashOsmEditsFragment extends DashBaseFragment {
 		setupEditings();		
 	}
 	
-	
 	private void setupEditings() {
 		View mainView = getView();
 		if (plugin == null){
 			mainView.setVisibility(View.GONE);
 			return;
 		}
+
+		ArrayList<OsmPoint> dataPoints = new ArrayList<>();
+		getOsmPoints(dataPoints);
+		if (dataPoints.size() == 0){
+			mainView.setVisibility(View.GONE);
+			return;
+		} else {
+			mainView.setVisibility(View.VISIBLE);
+		}
+
+		LinearLayout osmLayout = (LinearLayout) mainView.findViewById(R.id.notes);
+		osmLayout.removeAllViews();
+
+		for (final OsmPoint point : dataPoints){
+			LayoutInflater inflater = getActivity().getLayoutInflater();
+			View view = inflater.inflate(R.layout.note, null, false);
+
+			OsmEditsFragment.getOsmEditView(view, point, getMyApplication());
+			ImageButton send =(ImageButton) view.findViewById(R.id.play);
+			send.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_gup_dark));
+			send.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					OpenstreetmapRemoteUtil remotepoi = new OpenstreetmapRemoteUtil(getActivity(), getActivity().getWindow().getDecorView());
+					OsmPoint[] toUpload = new OsmPoint[]{point};
+					OsmBugsRemoteUtil remotebug = new OsmBugsRemoteUtil(getMyApplication());
+					ProgressDialog dialog = ProgressImplementation.createProgressDialog(
+							getActivity(),
+							getString(R.string.uploading),
+							getString(R.string.local_openstreetmap_uploading),
+							ProgressDialog.STYLE_HORIZONTAL).getDialog();
+					UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(dialog,DashOsmEditsFragment.this, remotepoi,
+							remotebug, toUpload.length);
+					uploadTask.execute(toUpload);
+					dialog.show();
+				}
+			});
+			view.findViewById(R.id.options).setVisibility(View.GONE);
+			view.findViewById(R.id.divider).setVisibility(View.VISIBLE);
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					boolean poi = point.getGroup() == OsmPoint.Group.POI;
+					String name = poi ?
+							((OpenstreetmapPoint) point).getName() : ((OsmNotesPoint) point).getText();
+					getMyApplication().getSettings().setMapLocationToShow(point.getLatitude(), point.getLongitude(),
+							15, new PointDescription(poi ? PointDescription.POINT_TYPE_POI : PointDescription.POINT_TYPE_OSM_BUG, name), true,
+							point); //$NON-NLS-1$
+					MapActivity.launchMapActivityMoveToTop(getActivity());
+				}
+			});
+			osmLayout.addView(view);
+		}
+	}
+
+	private void getOsmPoints(ArrayList<OsmPoint> dataPoints) {
+		OpenstreetmapsDbHelper dbpoi = new OpenstreetmapsDbHelper(getActivity());
+		OsmBugsDbHelper dbbug = new OsmBugsDbHelper(getActivity());
+
+		List<OpenstreetmapPoint> l1 = dbpoi.getOpenstreetmapPoints();
+		List<OsmNotesPoint> l2 = dbbug.getOsmbugsPoints();
+		if (l1.isEmpty()){
+			int i = 0;
+			for(OsmPoint point : l2){
+				if (i > 2) {
+					break;
+				}
+				dataPoints.add(point);
+				i++;
+			}
+		} else if (l2.isEmpty()) {
+			int i = 0;
+			for(OsmPoint point : l1){
+				if (i > 2) {
+					break;
+				}
+				dataPoints.add(point);
+				i++;
+			}
+		} else {
+			dataPoints.add(l1.get(0));
+			dataPoints.add(l2.get(0));
+			if (l1.size() > 1){
+				dataPoints.add(l1.get(1));
+			} else if (l2.size() > 1){
+				dataPoints.add(l2.get(1));
+			}
+		}
+	}
+
+	@Override
+	public void uploadUpdated(OsmPoint point) {
+		if (!this.isDetached()){
+			onOpenDash();
+		}
+	}
+
+	@Override
+	public void uploadEnded(Integer result) {
+		if (!this.isDetached()){
+			onOpenDash();
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index 511bae8757..2ea692ac10 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -2,6 +2,7 @@ package net.osmand.plus.osmedit;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +47,8 @@ import android.text.method.LinkMovementMethod;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -98,7 +101,7 @@ public class EditingPOIActivity implements DialogProvider {
 		this.activity = uiContext;
 
 		poiTypes = uiContext.getMyApplication().getPoiTypes();
-		allTranslatedSubTypes = poiTypes.getAllTranslatedNames();
+		allTranslatedSubTypes = poiTypes.getAllTranslatedNames(false);
 		settings = ((OsmandApplication) uiContext.getApplication()).getSettings();
 		if (settings.OFFLINE_EDITION.get() || !settings.isInternetConnectionAvailable(true)) {
 			this.openstreetmapUtil = new OpenstreetmapLocalUtil(activity);
@@ -463,7 +466,7 @@ public class EditingPOIActivity implements DialogProvider {
 						.getString(R.string.poi_action_change);
 				OsmPoint.Action action = n.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
 				String subType = typeText.getText().toString();
-				if(allTranslatedSubTypes.get(subType) != null) {
+				if(allTranslatedSubTypes.get(subType.trim()) != null) {
 					PoiType pt = allTranslatedSubTypes.get(subType);
 					n.putTag(pt.getOsmTag()	, pt.getOsmValue());
 					if(pt.getOsmTag2() != null) {
@@ -528,14 +531,37 @@ public class EditingPOIActivity implements DialogProvider {
 	}
 
 	private void updateSubTypesAdapter(PoiCategory poiCategory) {
-		Set<String> subCategories = new LinkedHashSet<String>(poiTypes.getAllTranslatedNames(poiCategory).keySet());
-		for (String s : poiTypes.getAllTranslatedNames().keySet()) {
-			if (!subCategories.contains(s)) {
-				subCategories.add(s);
+		final Map<String, PoiType> subCategories = getSubCategoriesMap(poiCategory);
+		final ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(activity, R.layout.list_textview, subCategories.keySet().toArray());
+		typeText.setAdapter(adapter);
+		typeText.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+				Object item = parent.getAdapter().getItem(position);
+				if(subCategories.containsKey(item)) {
+					String kn = subCategories.get(item).getKeyName();
+					typeText.setText(kn);
+				}
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+			}
+		});
+	}
+
+	private Map<String, PoiType> getSubCategoriesMap(PoiCategory poiCategory) {
+		Map<String, PoiType> subCategories = new LinkedHashMap<>(poiTypes.getAllTranslatedNames(poiCategory, false));
+		for (Map.Entry<String, PoiType> s : poiTypes.getAllTranslatedNames(false).entrySet()) {
+			if (!subCategories.containsKey(s.getKey())) {
+				subCategories.put(s.getKey(), s.getValue());
 			}
 		}
-		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(activity, R.layout.list_textview, subCategories.toArray());
+		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(activity, R.layout.list_textview, 
+				subCategories.keySet().toArray());
 		typeText.setAdapter(adapter);
+		return subCategories;
 	}
 	
 	private void updateType(Amenity a){
@@ -628,11 +654,13 @@ public class EditingPOIActivity implements DialogProvider {
 		case DIALOG_SUB_CATEGORIES: {
 			Builder builder = new AlertDialog.Builder(activity);
 			final Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
-			final String[] subCats = poiTypes.getAllTranslatedNames(a.getType()).keySet().toArray(new String[0]);
+			final Map<String, PoiType> allTranslatedNames = poiTypes.getAllTranslatedNames(a.getType(), true);
+			final String[] subCats = allTranslatedNames.keySet().toArray(new String[0]);
 			builder.setItems(subCats, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					typeText.setText(subCats[which]);
+					PoiType poiType = allTranslatedNames.get(subCats[which]);
+					typeText.setText(poiType.getKeyName());
 					a.setSubType(subCats[which]);
 					activity.removeDialog(DIALOG_SUB_CATEGORIES);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
index d14226de1f..242c7daaaa 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
@@ -88,11 +88,11 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity {
 	
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		createMenuItem(menu, UPLOAD_ID, R.string.local_openstreetmap_uploadall, R.drawable.ic_action_gup_light, R.drawable.ic_action_gup_dark,
+		createMenuItem(menu, UPLOAD_ID, R.string.local_openstreetmap_uploadall, R.drawable.ic_action_gup_dark, R.drawable.ic_action_gup_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-		createMenuItem(menu, BACKUP_ID, R.string.local_osm_changes_backup, R.drawable.ic_action_gsave_light, R.drawable.ic_action_gsave_dark,
+		createMenuItem(menu, BACKUP_ID, R.string.local_osm_changes_backup, R.drawable.ic_action_gsave_dark, R.drawable.ic_action_gsave_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-		createMenuItem(menu, DELETE_ID, R.string.shared_string_delete_all, R.drawable.ic_action_gdiscard_light, R.drawable.ic_action_gdiscard_dark,
+		createMenuItem(menu, DELETE_ID, R.string.shared_string_delete_all, R.drawable.ic_action_gdiscard_dark, R.drawable.ic_action_gdiscard_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		return super.onCreateOptionsMenu(menu);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapPoint.java b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapPoint.java
index 8f09462989..f16233db5c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapPoint.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapPoint.java
@@ -2,7 +2,6 @@ package net.osmand.plus.osmedit;
 
 import java.io.Serializable;
 
-import net.osmand.data.AmenityType;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.OSMSettings.OSMTagKey;
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
index 9433a7d378..c0d3ec1f49 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
@@ -1,9 +1,14 @@
 package net.osmand.plus.osmedit;
 
+import android.app.AlertDialog;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v7.widget.PopupMenu;
+import android.util.Xml;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -15,6 +20,9 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import net.osmand.access.AccessibleToast;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -22,16 +30,24 @@ import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.myplaces.FavoritesActivity;
 
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
  * Created by Denis
  * on 06.03.2015.
  */
-public class OsmEditsFragment extends ListFragment {
+public class OsmEditsFragment extends ListFragment implements OsmEditsUploadListener {
 	OsmEditingPlugin plugin;
 	private ArrayList<OsmPoint> dataPoints;
 	private OsmEditsAdapter listAdapter;
@@ -39,8 +55,13 @@ public class OsmEditsFragment extends ListFragment {
 	private OpenstreetmapsDbHelper dbpoi;
 	private OsmBugsDbHelper dbbug;
 
+	private OpenstreetmapRemoteUtil remotepoi;
+	private OsmBugsRemoteUtil remotebug;
+
 	protected OsmPoint[] toUpload = new OsmPoint[0];
 
+	ProgressDialog dialog;
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		setHasOptionsMenu(true);
@@ -51,13 +72,73 @@ public class OsmEditsFragment extends ListFragment {
 		dbpoi = new OpenstreetmapsDbHelper(getActivity());
 		dbbug = new OsmBugsDbHelper(getActivity());
 
+		remotepoi = new OpenstreetmapRemoteUtil(getActivity(), getActivity().getWindow().getDecorView());
+		remotebug = new OsmBugsRemoteUtil(getMyApplication());
+
 		return view;
 	}
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
-		((FavoritesActivity) getActivity()).getClearToolbar(false);
+
+		if (ScreenOrientationHelper.isOrientationPortrait(getActivity())) {
+			menu = ((FavoritesActivity) getActivity()).getClearToolbar(true).getMenu();
+		} else {
+			((FavoritesActivity) getActivity()).getClearToolbar(false);
+		}
+		MenuItem item = menu.add(R.string.local_openstreetmap_uploadall).
+				setIcon(R.drawable.ic_action_export);
+		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				toUpload = dataPoints.toArray(new OsmPoint[0]);
+				showUploadItemsDialog();
+				return true;
+			}
+		});
+		MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+
+		item = menu.add(R.string.local_osm_changes_backup).
+				setIcon(R.drawable.ic_action_gsave_dark);
+		MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				new BackupOpenstreetmapPointAsyncTask().execute(dataPoints.toArray(new OsmPoint[0]));
+				return true;
+			}
+		});
+		item = menu.add(R.string.shared_string_delete_all).
+				setIcon(R.drawable.ic_action_delete_dark);
+		MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+				b.setMessage(getString(R.string.local_osm_changes_delete_all_confirm, dataPoints.size()));
+				b.setPositiveButton(R.string.shared_string_delete, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						Iterator<OsmPoint> it = dataPoints.iterator();
+						while(it.hasNext()) {
+							OsmPoint info = it.next();
+							if (info.getGroup() == OsmPoint.Group.POI) {
+								dbpoi.deletePOI((OpenstreetmapPoint) info);
+							} else if (info.getGroup() == OsmPoint.Group.BUG) {
+								dbbug.deleteAllBugModifications((OsmNotesPoint) info);
+							}
+							it.remove();
+							listAdapter.delete(info);
+						}
+						listAdapter.notifyDataSetChanged();
+					}
+				});
+				b.setNegativeButton(R.string.shared_string_cancel, null);
+				b.show();
+				return true;
+			}
+		});
 	}
 
 	@Override
@@ -76,12 +157,36 @@ public class OsmEditsFragment extends ListFragment {
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 				OsmPoint it = listAdapter.getItem(position);
 				openPopUpMenu(view, it);
-				
+
 			}
 		});
 
 	}
 
+	public static void getOsmEditView(View v, OsmPoint child, OsmandApplication app){
+		TextView viewName = ((TextView) v.findViewById(R.id.name));
+		ImageView icon = (ImageView) v.findViewById(R.id.icon);
+		String idPrefix = (child.getGroup() == OsmPoint.Group.POI ? "POI " : "Bug ") + " id: " + child.getId();
+		if (child.getGroup() == OsmPoint.Group.POI) {
+			viewName.setText(idPrefix + " (" + ((OpenstreetmapPoint) child).getSubtype() + ") " + ((OpenstreetmapPoint) child).getName());
+			icon.setImageDrawable(app.getIconsCache().
+					getIcon(R.drawable.ic_type_info, R.color.color_distance));
+		} else if (child.getGroup() == OsmPoint.Group.BUG) {
+			viewName.setText(idPrefix + " (" + ((OsmNotesPoint) child).getAuthor() + ") " + ((OsmNotesPoint) child).getText());
+			icon.setImageDrawable(app.getIconsCache().
+					getIcon(R.drawable.ic_type_bug, R.color.color_distance));
+		}
+
+		TextView descr = (TextView) v.findViewById(R.id.descr);
+		if (child.getAction() == OsmPoint.Action.CREATE) {
+			descr.setText(R.string.action_create);
+		} else if (child.getAction() == OsmPoint.Action.MODIFY) {
+			descr.setText(R.string.action_modify);
+		} else if (child.getAction() == OsmPoint.Action.DELETE) {
+			descr.setText(R.string.action_delete);
+		}
+	}
+
 	protected class OsmEditsAdapter extends ArrayAdapter<OsmPoint> {
 
 		public OsmEditsAdapter(List<OsmPoint> points) {
@@ -102,29 +207,10 @@ public class OsmEditsFragment extends ListFragment {
 				LayoutInflater inflater = getActivity().getLayoutInflater();
 				v = inflater.inflate(net.osmand.plus.R.layout.note, parent, false);
 			}
-			TextView viewName = ((TextView) v.findViewById(R.id.name));
-			ImageView icon = (ImageView) v.findViewById(R.id.icon);
+			getOsmEditView(v, child, getMyApplication());
 
 			v.findViewById(R.id.play).setVisibility(View.GONE);
-			String idPrefix = (child.getGroup() == OsmPoint.Group.POI ? "POI " : "Bug ") + " id: " + child.getId();
-			if (child.getGroup() == OsmPoint.Group.POI) {
-				viewName.setText(idPrefix + " (" + ((OpenstreetmapPoint) child).getSubtype() + ") " + ((OpenstreetmapPoint) child).getName());
-				icon.setImageDrawable(getMyApplication().getIconsCache().
-						getIcon(R.drawable.ic_type_info, R.color.color_distance));
-			} else if (child.getGroup() == OsmPoint.Group.BUG) {
-				viewName.setText(idPrefix + " (" + ((OsmNotesPoint) child).getAuthor() + ") " + ((OsmNotesPoint) child).getText());
-				icon.setImageDrawable(getMyApplication().getIconsCache().
-						getIcon(R.drawable.ic_type_bug, R.color.color_distance));
-			}
 
-			TextView descr = (TextView) v.findViewById(R.id.descr);
-			if (child.getAction() == OsmPoint.Action.CREATE) {
-				descr.setText(R.string.action_create);
-			} else if (child.getAction() == OsmPoint.Action.MODIFY) {
-				descr.setText(R.string.action_modify);
-			} else if (child.getAction() == OsmPoint.Action.DELETE) {
-				descr.setText(R.string.action_delete);
-			}
 			v.findViewById(R.id.options).setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -166,17 +252,12 @@ public class OsmEditsFragment extends ListFragment {
 			}
 		});
 		item = optionsMenu.getMenu().add(R.string.local_openstreetmap_upload).
-				setIcon(app.getIconsCache().getContentIcon(R.drawable.ic_action_gup_dark));
+				setIcon(app.getIconsCache().getContentIcon(R.drawable.ic_action_export));
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
 				toUpload = new OsmPoint[]{info};
-				ProgressDialog implementation = ProgressImplementation.createProgressDialog(
-						getActivity(),
-						getString(R.string.uploading),
-						getString(R.string.local_openstreetmap_uploading),
-						ProgressDialog.STYLE_HORIZONTAL).getDialog();
-				implementation.show();
+				showUploadItemsDialog();
 				return true;
 			}
 		});
@@ -187,4 +268,133 @@ public class OsmEditsFragment extends ListFragment {
 		return (OsmandApplication) getActivity().getApplication();
 	}
 
+	private void showUploadItemsDialog(){
+		dialog = ProgressImplementation.createProgressDialog(
+				getActivity(),
+				getString(R.string.uploading),
+				getString(R.string.local_openstreetmap_uploading),
+				ProgressDialog.STYLE_HORIZONTAL).getDialog();
+		UploadOpenstreetmapPointAsyncTask uploadTask = new UploadOpenstreetmapPointAsyncTask(dialog, this, remotepoi,
+				remotebug, toUpload.length);
+		uploadTask.execute(toUpload);
+
+		dialog.show();
+	}
+
+
+	public class BackupOpenstreetmapPointAsyncTask extends AsyncTask<OsmPoint, OsmPoint, String> {
+
+
+		private File osmchange;
+
+		public BackupOpenstreetmapPointAsyncTask() {
+			OsmandApplication app = (OsmandApplication) getActivity().getApplication();
+			osmchange = app.getAppPath("poi_modification.osc");
+		}
+
+
+		@Override
+		protected String doInBackground(OsmPoint... points) {
+			FileOutputStream out = null;
+			try {
+				out = new FileOutputStream(osmchange);
+				XmlSerializer sz = Xml.newSerializer();
+
+				sz.setOutput(out, "UTF-8");
+				sz.startDocument("UTF-8", true);
+				sz.startTag("", "osmChange");
+				sz.attribute("", "generator", "OsmAnd");
+				sz.attribute("", "version", "0.6");
+				sz.startTag("", "create");
+				writeContent(sz, points, OsmPoint.Action.CREATE);
+				sz.endTag("", "create");
+				sz.startTag("", "modify");
+				writeContent(sz, points, OsmPoint.Action.MODIFY);
+				sz.endTag("", "modify");
+				sz.startTag("", "delete");
+				writeContent(sz, points, OsmPoint.Action.DELETE);
+				sz.endTag("", "delete");
+				sz.endTag("", "osmChange");
+				sz.endDocument();
+			} catch (Exception e) {
+				return e.getMessage();
+			} finally {
+				try {
+					if(out!= null) out.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+
+			return null;
+		}
+
+		private void writeContent(XmlSerializer sz, OsmPoint[] points, OsmPoint.Action a) throws IllegalArgumentException, IllegalStateException, IOException {
+			for (OsmPoint point : points) {
+				if (point.getGroup() == OsmPoint.Group.POI) {
+					OpenstreetmapPoint p = (OpenstreetmapPoint) point;
+					if (p.getAction() == a) {
+						sz.startTag("", "node");
+						sz.attribute("", "lat", p.getLatitude() + "");
+						sz.attribute("", "lon", p.getLongitude() + "");
+						sz.attribute("", "id", p.getId() + "");
+						sz.attribute("", "version", "1");
+						for (String tag : p.getEntity().getTagKeySet()) {
+							String val = p.getEntity().getTag(tag);
+							sz.startTag("", "tag");
+							sz.attribute("", "k", tag);
+							sz.attribute("", "v", val);
+							sz.endTag("", "tag");
+						}
+						sz.endTag("", "node");
+					}
+				} else if (point.getGroup() == OsmPoint.Group.BUG) {
+					OsmNotesPoint p = (OsmNotesPoint) point;
+					if (p.getAction() == a) {
+						sz.startTag("", "note");
+						sz.attribute("", "lat", p.getLatitude() + "");
+						sz.attribute("", "lon", p.getLongitude() + "");
+						sz.attribute("", "id", p.getId() + "");
+						sz.startTag("", "comment");
+						sz.attribute("", "text", p.getText() +"");
+						sz.endTag("", "comment");
+						sz.endTag("", "note");
+					}
+				}
+			}
+		}
+
+
+		@Override
+		protected void onPreExecute() {
+			getActivity().setProgressBarIndeterminateVisibility(true);
+		}
+
+		@Override
+		protected void onPostExecute(String result) {
+			getActivity().setProgressBarIndeterminateVisibility(false);
+			if (result != null) {
+				AccessibleToast.makeText(getActivity(), getString(R.string.local_osm_changes_backup_failed) + " " + result, Toast.LENGTH_LONG).show();
+			} else {
+				AccessibleToast.makeText(getActivity(), getString(R.string.local_osm_changes_backup_successful, osmchange.getAbsolutePath()), Toast.LENGTH_LONG).show();
+			}
+		}
+	}
+
+	@Override
+	public void uploadUpdated(OsmPoint point){
+		listAdapter.delete(point);
+	}
+
+	@Override
+	public void uploadEnded(Integer result){
+		listAdapter.notifyDataSetChanged();
+		if (result != null) {
+			AccessibleToast.makeText(getActivity(),
+					MessageFormat.format(getString(R.string.local_openstreetmap_were_uploaded), result), Toast.LENGTH_LONG)
+					.show();
+		}
+		dialog.dismiss();
+	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsUploadListener.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsUploadListener.java
new file mode 100644
index 0000000000..2edf57a300
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsUploadListener.java
@@ -0,0 +1,12 @@
+package net.osmand.plus.osmedit;
+
+/**
+ * Created by Denis
+ * on 11.03.2015.
+ */
+public interface OsmEditsUploadListener {
+
+	public void uploadUpdated(OsmPoint point);
+
+	public void uploadEnded(Integer result);
+}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/UploadOpenstreetmapPointAsyncTask.java b/OsmAnd/src/net/osmand/plus/osmedit/UploadOpenstreetmapPointAsyncTask.java
new file mode 100644
index 0000000000..cdd2f2b035
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/osmedit/UploadOpenstreetmapPointAsyncTask.java
@@ -0,0 +1,127 @@
+package net.osmand.plus.osmedit;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.support.v4.app.Fragment;
+import android.widget.Toast;
+
+import net.osmand.access.AccessibleToast;
+import net.osmand.osm.edit.EntityInfo;
+import net.osmand.osm.edit.Node;
+import net.osmand.plus.R;
+
+import java.text.MessageFormat;
+
+/**
+ * Created by Denis
+ * on 11.03.2015.
+ */
+public class UploadOpenstreetmapPointAsyncTask extends AsyncTask<OsmPoint, OsmPoint, Integer> {
+
+	private ProgressDialog progress;
+
+	private OpenstreetmapRemoteUtil remotepoi;
+
+	private OsmBugsRemoteUtil remotebug;
+
+	private OpenstreetmapsDbHelper dbpoi;
+	private OsmBugsDbHelper dbbug;
+
+	private int listSize = 0;
+
+	private boolean interruptUploading = false;
+
+	private Fragment ctx;
+
+	public UploadOpenstreetmapPointAsyncTask(ProgressDialog progress,Fragment ctx, OpenstreetmapRemoteUtil remotepoi, OsmBugsRemoteUtil remotebug,
+											 int listSize) {
+		this.progress = progress;
+		this.remotepoi = remotepoi;
+		this.remotebug = remotebug;
+		this.listSize = listSize;
+		dbpoi = new OpenstreetmapsDbHelper(ctx.getActivity());
+		dbbug = new OsmBugsDbHelper(ctx.getActivity());
+	}
+
+	@Override
+	protected Integer doInBackground(OsmPoint... points) {
+		int uploaded = 0;
+
+		for (OsmPoint point : points) {
+			if (interruptUploading)
+				break;
+
+			if (point.getGroup() == OsmPoint.Group.POI) {
+				OpenstreetmapPoint p = (OpenstreetmapPoint) point;
+				EntityInfo entityInfo = null;
+				if (OsmPoint.Action.CREATE != p.getAction()) {
+					entityInfo = remotepoi.loadNode(p.getEntity());
+				}
+				Node n = remotepoi.commitNodeImpl(p.getAction(), p.getEntity(), entityInfo, p.getComment(), false);
+				if (n != null) {
+					dbpoi.deletePOI(p);
+					publishProgress(p);
+					uploaded++;
+				}
+			} else if (point.getGroup() == OsmPoint.Group.BUG) {
+				OsmNotesPoint p = (OsmNotesPoint) point;
+				boolean success = false;
+				if (p.getAction() == OsmPoint.Action.CREATE) {
+					success = remotebug.createNewBug(p.getLatitude(), p.getLongitude(), p.getText()) == null;
+				} else if (p.getAction() == OsmPoint.Action.MODIFY) {
+					success = remotebug.addingComment(p.getId(), p.getText()) == null;
+				} else if (p.getAction() == OsmPoint.Action.DELETE) {
+					success = remotebug.closingBug(p.getId(), p.getText()) == null;
+				}
+				if (success) {
+					dbbug.deleteAllBugModifications(p);
+					uploaded++;
+					publishProgress(p);
+				}
+
+			}
+		}
+
+		return uploaded;
+	}
+
+	@Override
+	protected void onPreExecute() {
+		interruptUploading = false;
+
+		progress.setOnCancelListener(new DialogInterface.OnCancelListener() {
+			@Override
+			public void onCancel(DialogInterface dialog) {
+				UploadOpenstreetmapPointAsyncTask.this.setInterruptUploading(true);
+			}
+		});
+		progress.setIndeterminate(false);
+		progress.setMax(listSize);
+		progress.setProgress(0);
+	}
+
+	@Override
+	protected void onPostExecute(Integer result) {
+		if (ctx instanceof OsmEditsUploadListener){
+			((OsmEditsUploadListener)ctx).uploadEnded(result);
+		}
+	}
+
+	public void setInterruptUploading(boolean b) {
+		interruptUploading = b;
+	}
+
+	@Override
+	protected void onProgressUpdate(OsmPoint... points) {
+		for(OsmPoint p : points) {
+			if (ctx instanceof OsmEditsUploadListener){
+				((OsmEditsUploadListener)ctx).uploadUpdated(p);
+			}
+			progress.incrementProgressBy(1);
+		}
+	}
+
+}
+
diff --git a/OsmAnd/src/net/osmand/plus/osmo/DashOsmoFragment.java b/OsmAnd/src/net/osmand/plus/osmo/DashOsmoFragment.java
index 165b6a55f8..4251132be0 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/DashOsmoFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/DashOsmoFragment.java
@@ -1,22 +1,32 @@
 package net.osmand.plus.osmo;
 
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.R;
-import net.osmand.plus.dashboard.DashBaseFragment;
-import net.osmand.plus.helpers.FontCache;
+import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import net.osmand.plus.IconsCache;
+import net.osmand.plus.NavigationService;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+import net.osmand.plus.dashboard.DashBaseFragment;
+import net.osmand.plus.helpers.FontCache;
+
 /**
  * Created by Denis
  * on 20.01.2015.
  */
 public class DashOsmoFragment extends DashBaseFragment {
+
+	public static final String TAG = "DASH_OSMO_FRAGMENT";
+
 	OsMoPlugin plugin;
 
 	@Override
@@ -26,14 +36,105 @@ public class DashOsmoFragment extends DashBaseFragment {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_osmo_fragment, container, false);
 		Typeface typeface = FontCache.getRobotoMedium(getActivity());
 		((TextView) view.findViewById(R.id.osmo_text)).setTypeface(typeface);
-		Button manage = (Button) view.findViewById(R.id.manage);
-
+		view.findViewById(R.id.manage).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(getActivity(), OsMoGroupsActivity.class);
+				getActivity().startActivity(intent);
+			}
+		});
 
+		setupHader(view);
 		return view;
 	}
 
 	@Override
 	public void onOpenDash() {
-		plugin = OsmandPlugin.getEnabledPlugin(OsMoPlugin.class);		
+		plugin = OsmandPlugin.getEnabledPlugin(OsMoPlugin.class);
+
+		setupOsMoView();
+	}
+
+	private void setupOsMoView() {
+		View mainView = getView();
+
+		boolean show = plugin != null;
+		if (show) {
+			show = plugin.getService().isEnabled();
+		}
+		if (!show) {
+			mainView.setVisibility(View.GONE);
+			return;
+		} else {
+			mainView.setVisibility(View.VISIBLE);
+		}
+		updateStatus();
+	}
+
+	private void setupHader(final View header) {
+		CompoundButton trackr = (CompoundButton) header.findViewById(R.id.check_item);
+
+		final OsmandApplication app = getMyApplication();
+		trackr.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				if(isChecked) {
+					if (plugin != null && plugin.getTracker() != null){
+						plugin.getTracker().enableTracker();
+					}
+					app.startNavigationService(NavigationService.USED_BY_LIVE);
+					//interval setting not needed here, handled centrally in app.startNavigationService
+					//app.getSettings().SERVICE_OFF_INTERVAL.set(0);
+				} else {
+					if (plugin != null && plugin.getTracker() != null){
+						plugin.getTracker().disableTracker();
+					}
+					if (app.getNavigationService() != null) {
+						app.getNavigationService().stopIfNeeded(app,NavigationService.USED_BY_LIVE);
+					}
+				}
+				updateStatus();
+			}
+		});
+		ImageButton share = (ImageButton) header.findViewById(R.id.share);
+		IconsCache cache = getMyApplication().getIconsCache();
+		share.setImageDrawable(cache.getContentIcon(R.drawable.ic_action_gshare_dark));
+		share.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				OsMoGroupsActivity.shareSessionUrl(plugin, getActivity());
+			}
+		});
+		updateStatus();
+	}
+
+	private void updateStatus(){
+
+		View header = getView();
+		if(getView() == null) {
+			return;
+		}
+		CompoundButton trackr = (CompoundButton) header.findViewById(R.id.check_item);
+		if(plugin != null && plugin.getTracker() != null){
+			trackr.setChecked(plugin.getTracker().isEnabledTracker());
+		}
+
+	}
+
+	private void synchronizeGroups(boolean clear){
+		View mainView = getView();
+
+		LinearLayout items = (LinearLayout) mainView.findViewById(R.id.items);
+		items.removeAllViews();
+		if (clear) {
+			return;
+		}
+	}
+
+	private void showProgress(boolean show) {
+		if (getView() != null){
+			getView().findViewById(R.id.progress).setVisibility(show ? View.VISIBLE : View.GONE);
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index daaa0222d5..8b2eb57c83 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -3,21 +3,61 @@
  */
 package net.osmand.plus.osmo;
 
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.Path;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.view.ActionMode;
-import android.view.*;
-import gnu.trove.list.array.TIntArrayList;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import android.text.Spannable;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ForegroundColorSpan;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.ExpandableListView;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.ScrollView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import net.osmand.AndroidUtils;
 import net.osmand.Location;
@@ -38,53 +78,23 @@ import net.osmand.plus.activities.OsmandExpandableListActivity;
 import net.osmand.plus.activities.actions.ShareDialog;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.helpers.ColorDialogs;
+import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.osmo.OsMoGroups.OsMoGroupsUIListener;
 import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoDevice;
 import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoGroup;
 import net.osmand.plus.osmo.OsMoService.SessionInfo;
 import net.osmand.util.MapUtils;
-import android.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.Path;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Spannable;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ForegroundColorSpan;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ExpandableListView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.ScrollView;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import gnu.trove.list.array.TIntArrayList;
 
 /**
  *
@@ -433,31 +443,31 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 							MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 				}
 				if (device != null && device.getLastLocation() != null) {
-					createMenuItem(menu, SHOW_ON_MAP_ID, R.string.shared_string_show_on_map, R.drawable.ic_action_marker_light, R.drawable.ic_action_marker_dark,
+					createMenuItem(menu, SHOW_ON_MAP_ID, R.string.shared_string_show_on_map, R.drawable.ic_action_marker_dark,
 							MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				}
-				createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark,
+				createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark,
 						// there is a bug in Android 4.2 layout
 						device != null && device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				///
 				if (device != null) {
-					createMenuItem(menu, SETTINGS_DEV_ID, R.string.shared_string_settings, R.drawable.ic_action_settings_enabled_light, R.drawable.ic_action_settings_enabled_dark,
+					createMenuItem(menu, SETTINGS_DEV_ID, R.string.shared_string_settings, R.drawable.ic_action_settings_enabled_dark,
 							// there is a bug in Android 4.2 layout
 							device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				}
 				if (device != null && device.getLastLocation() != null) {
-					MenuItem menuItem = createMenuItem(menu, TRACK_DEV_ID, R.string.osmo_set_moving_target, R.drawable.ic_action_flage_light, R.drawable.ic_action_flage_dark,
-							// there is a bug in Android 4.2 layout
+					MenuItem menuItem = createMenuItem(menu, TRACK_DEV_ID, R.string.osmo_set_moving_target, R.drawable.ic_action_flage_dark,
+												// there is a bug in Android 4.2 layout
 							device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 					menuItem.setTitleCondensed(getString(R.string.osmo_follow));
 				}
 				if (group != null) {
-					createMenuItem(menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_info_light, R.drawable.ic_action_info_dark,
+					createMenuItem(menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_info_dark,
 							MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				}
 				if ((group != null && !group.isMainGroup()) || (device != null && device.getGroup().isMainGroup())) {
 					createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete,
-							R.drawable.ic_action_delete_light, R.drawable.ic_action_delete_dark,
+							R.drawable.ic_action_delete_dark,
 							MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				}
 
@@ -664,7 +674,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				if (which == 0) {
-					shareSessionUrl();
+					shareSessionUrl(osMoPlugin, OsMoGroupsActivity.this);
 				} else {
 					OsMoService service = osMoPlugin.getService();
 					SessionInfo ci = service.getCurrentSessionInfo();
@@ -676,15 +686,15 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		bld.show();
 	}
 	
-	private void shareSessionUrl() {
+	public static void shareSessionUrl(OsMoPlugin osMoPlugin, Activity ctx) {
 		String sessionURL = osMoPlugin.getTracker().getSessionURL();
 		if(sessionURL == null ) {
-			AccessibleToast.makeText(this, R.string.osmo_session_not_available, Toast.LENGTH_SHORT).show();
+			AccessibleToast.makeText(ctx, R.string.osmo_session_not_available, Toast.LENGTH_SHORT).show();
 		} else {
-			ShareDialog dlg = new ShareDialog(this);
-			dlg.setTitle(getString(R.string.osmo_share_session));
+			ShareDialog dlg = new ShareDialog(ctx);
+			dlg.setTitle(ctx.getString(R.string.osmo_share_session));
 			dlg.viewContent(sessionURL);
-			dlg.shareURLOrText(sessionURL, getString(R.string.osmo_session_id_share, sessionURL), null);
+			dlg.shareURLOrText(sessionURL, ctx.getString(R.string.osmo_session_id_share, sessionURL), null);
 			dlg.showDialog();
 		}
 	}
@@ -850,7 +860,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		final EditText description = (EditText) v.findViewById(R.id.Description);
 		final EditText name = (EditText) v.findViewById(R.id.Name);
 		final CheckBox onlyByInvite = (CheckBox) v.findViewById(R.id.OnlyByInvite);
-		final TextView warnCreate = (TextView) v.findViewById(R.id.osmo_group_create_info);
+
 		final TextView warnCreateDesc = (TextView) v.findViewById(R.id.osmo_group_create_dinfo);
 		View.OnClickListener click = new View.OnClickListener() {
 			
@@ -860,7 +870,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				warnCreateDesc.setVisibility(vls == View.VISIBLE? View.GONE : View.VISIBLE);
 			}
 		};
-		warnCreate.setOnClickListener(click);
+		ImageButton info = (ImageButton) v.findViewById(R.id.info);
+		info.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_info_dark));
+		info.setOnClickListener(click);
 		warnCreateDesc.setOnClickListener(click);
 		
 		builder.setView(v);
@@ -957,18 +969,26 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.clear();
+		Menu oldMenu = menu;
+		boolean portrait = ScreenOrientationHelper.isOrientationPortrait(this);
+		if (portrait) {
+			menu = getClearToolbar(true).getMenu();
+		} else {
+			getClearToolbar(false);
+		}
 		createMenuItem(menu, CONNECT_TO, R.string.osmo_connect, 
 				0, 0,/*R.drawable.ic_action_marker_light,*/
-				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, SHARE_SESSION, R.string.osmo_share_session, 
-				R.drawable.ic_action_gshare_dark, R.drawable.ic_action_gshare_dark,
-				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+				R.drawable.ic_action_gshare_dark,
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, CREATE_GROUP, R.string.osmo_create_group, 
-				R.drawable.ic_action_plus_dark, R.drawable.ic_action_plus_dark,
-				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-		createMenuItem(menu, SETTINGS_ID, R.string.shared_string_settings, 
-				R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_dark,
-				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+				R.drawable.ic_group_add,
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		createMenuItem(oldMenu, SETTINGS_ID, R.string.shared_string_settings,
+				R.drawable.ic_action_settings_enabled_dark,
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		return super.onCreateOptionsMenu(menu);
 	}
 
@@ -1220,7 +1240,11 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			if(selectedObject == model) {
 				row.setBackgroundColor(getResources().getColor(R.color.row_selection_color));
 			} else {
-				row.setBackgroundColor(Color.TRANSPARENT);
+				if (app.getSettings().isLightContent()){
+					row.setBackgroundResource(R.drawable.expandable_list_item_background_light);
+				} else {
+					row.setBackgroundResource(R.drawable.expandable_list_item_background_dark);
+				}
 			}
 			TextView label = (TextView) row.findViewById(R.id.osmo_label);
 			TextView labelTime = (TextView) row.findViewById(R.id.osmo_label_time);
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
index 480225a523..0a72c1d71f 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
@@ -2,26 +2,23 @@ package net.osmand.plus.parkingpoint;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.util.TimeUtils;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-import android.text.format.Time;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
-import net.osmand.Location;
+
 import net.osmand.data.LatLon;
-import net.osmand.plus.OsmAndFormatter;
+import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashLocationFragment;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.util.MapUtils;
 
 import java.util.Calendar;
 
@@ -52,6 +49,16 @@ public class DashParkingFragment extends DashLocationFragment {
 		});
 		remove.setTypeface(typeface);
 
+		view.findViewById(R.id.parking_header).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				LatLon point = plugin.getParkingPosition();
+				getMyApplication().getSettings().setMapLocationToShow(point.getLatitude(), point.getLongitude(),
+						15, new PointDescription(PointDescription.POINT_TYPE_FAVORITE, plugin.getParkingDescription(getActivity())), true,
+						point); //$NON-NLS-1$
+				MapActivity.launchMapActivityMoveToTop(getActivity());
+			}
+		});
 		return view;
 	}
 
@@ -75,29 +82,41 @@ public class DashParkingFragment extends DashLocationFragment {
 
 		LatLon loc = getDefaultLocation();
 		LatLon position = plugin.getParkingPosition();
-		boolean limited =  plugin.getParkingType();
+		boolean limited = plugin.getParkingType();
 		String parking_name = limited ?
 				getString(R.string.parking_place_limited) : getString(R.string.parking_place);
 		if (limited) {
 			long endtime = plugin.getParkingTime();
 			long currTime = Calendar.getInstance().getTimeInMillis();
-			String time = getFormattedTime(endtime - currTime);
-			((TextView)mainView.findViewById(R.id.time_left)).setText(time);
+			long timeDiff = endtime - currTime;
+			String time = getFormattedTime(timeDiff);
+			TextView timeLeft = (TextView) mainView.findViewById(R.id.time_left);
+			TextView leftLabel = (TextView) mainView.findViewById(R.id.left_lbl);
+			timeLeft.setText(time);
+			if (timeDiff < 0) {
+				timeLeft.setTextColor(Color.RED);
+				leftLabel.setTextColor(Color.RED);
+				leftLabel.setText(R.string.osmand_parking_outdated);
+			} else {
+				timeLeft.setTextColor(Color.WHITE);
+				leftLabel.setTextColor(Color.WHITE);
+				leftLabel.setText(R.string.osmand_parking_time_left);
+			}
 			mainView.findViewById(R.id.left_lbl).setVisibility(View.VISIBLE);
 		} else {
-			((TextView)mainView.findViewById(R.id.time_left)).setText("");
+			((TextView) mainView.findViewById(R.id.time_left)).setText("");
 			mainView.findViewById(R.id.left_lbl).setVisibility(View.GONE);
 		}
 		((TextView) mainView.findViewById(R.id.name)).setText(parking_name);
 		ImageView direction = (ImageView) mainView.findViewById(R.id.direction_icon);
-		if (loc != null){
+		if (loc != null) {
 			DashLocationView dv = new DashLocationView(direction, (TextView) mainView.findViewById(R.id.distance), position);
+			dv.paint = false;
 			dv.arrowResId = R.drawable.ic_parking_postion_arrow;
 			distances.add(dv);
 		}
 
 
-
 	}
 
 	String getFormattedTime(long timeInMillis) {
@@ -106,16 +125,20 @@ public class DashParkingFragment extends DashLocationFragment {
 		}
 		StringBuilder timeStringBuilder = new StringBuilder();
 		int hours = (int) timeInMillis / (1000 * 60 * 60);
-		int miutes = (int) timeInMillis / (1000 * 60 * 60 * 60);
+		int minMills = (int) timeInMillis % (1000 * 60 * 60);
+		int minutes = minMills / (1000 * 60);
 		if (hours > 0) {
 			timeStringBuilder.append(hours);
 			timeStringBuilder.append(" ");
 			timeStringBuilder.append(getResources().getString(R.string.osmand_parking_hour));
 		}
+
 		timeStringBuilder.append(" ");
-		timeStringBuilder.append(miutes);
+		timeStringBuilder.append(minutes);
 		timeStringBuilder.append(" ");
 		timeStringBuilder.append(getResources().getString(R.string.osmand_parking_minute));
+
+
 		return timeStringBuilder.toString();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
index 8d0f6caee7..412e3e7a8a 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
@@ -136,45 +136,12 @@ public class ParkingPositionLayer extends OsmandMapLayer implements ContextMenuL
 	
 	@Override
 	public String getObjectDescription(Object o) {
-		if (o instanceof LatLon) {
-			StringBuilder timeLimitDesc = new StringBuilder();
-			timeLimitDesc.append(map.getString(R.string.osmand_parking_position_description_add_time) + " ");
-			timeLimitDesc.append(getFormattedTime(plugin.getStartParkingTime()) + ".");
-			if (plugin.getParkingType()) {
-				// long parkingTime = settings.getParkingTime();
-				// long parkingStartTime = settings.getStartParkingTime();
-				// Time time = new Time();
-				// time.set(parkingTime);
-				// timeLimitDesc.append(map.getString(R.string.osmand_parking_position_description_add) + " ");
-				// timeLimitDesc.append(time.hour);
-				// timeLimitDesc.append(":");
-				// int minute = time.minute;
-				// timeLimitDesc.append(minute<10 ? "0" + minute : minute);
-				// if (!DateFormat.is24HourFormat(map.getApplicationContext())) {
-				// timeLimitDesc.append(time.hour >= 12 ? map.getString(R.string.osmand_parking_pm) :
-				// map.getString(R.string.osmand_parking_am));
-				// }
-				timeLimitDesc.append(map.getString(R.string.osmand_parking_position_description_add) + " ");
-				timeLimitDesc.append(getFormattedTime(plugin.getParkingTime()));
-			}
-			return map.getString(R.string.osmand_parking_position_description, timeLimitDesc.toString());
-		}
-		return null;
+		return plugin.getParkingDescription(map);
+
 	}
 
-	String getFormattedTime(long timeInMillis) {
-		StringBuilder timeStringBuilder = new StringBuilder();
-		Time time = new Time();
-		time.set(timeInMillis);
-		timeStringBuilder.append(time.hour);
-		timeStringBuilder.append(":");
-		int minute = time.minute;
-		timeStringBuilder.append(minute < 10 ? "0" + minute : minute);
-		if (!DateFormat.is24HourFormat(map)) {
-			timeStringBuilder.append(time.hour >= 12 ? map.getString(R.string.osmand_parking_pm) : map
-					.getString(R.string.osmand_parking_am));
-		}
-		return timeStringBuilder.toString();
+	public String getFormattedTime(long time){
+		return plugin.getFormattedTime(time, map);
 	}
 	
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 40b8d4c082..45756c8f2b 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -27,6 +27,8 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Paint;
+import android.text.format.DateFormat;
+import android.text.format.Time;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
@@ -524,4 +526,43 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 	public int getLogoResourceId() {
 		return R.drawable.ic_action_parking_dark;
 	}
+
+	String getFormattedTime(long timeInMillis, Activity ctx) {
+		StringBuilder timeStringBuilder = new StringBuilder();
+		Time time = new Time();
+		time.set(timeInMillis);
+		timeStringBuilder.append(time.hour);
+		timeStringBuilder.append(":");
+		int minute = time.minute;
+		timeStringBuilder.append(minute < 10 ? "0" + minute : minute);
+		if (!DateFormat.is24HourFormat(ctx)) {
+			timeStringBuilder.append(time.hour >= 12 ? ctx.getString(R.string.osmand_parking_pm) : ctx
+					.getString(R.string.osmand_parking_am));
+		}
+		return timeStringBuilder.toString();
+	}
+
+	public String getParkingDescription(Activity ctx) {
+		StringBuilder timeLimitDesc = new StringBuilder();
+		timeLimitDesc.append(ctx.getString(R.string.osmand_parking_position_description_add_time) + " ");
+		timeLimitDesc.append(getFormattedTime(getStartParkingTime(), ctx) + ".");
+		if (getParkingType()) {
+			// long parkingTime = settings.getParkingTime();
+			// long parkingStartTime = settings.getStartParkingTime();
+			// Time time = new Time();
+			// time.set(parkingTime);
+			// timeLimitDesc.append(map.getString(R.string.osmand_parking_position_description_add) + " ");
+			// timeLimitDesc.append(time.hour);
+			// timeLimitDesc.append(":");
+			// int minute = time.minute;
+			// timeLimitDesc.append(minute<10 ? "0" + minute : minute);
+			// if (!DateFormat.is24HourFormat(map.getApplicationContext())) {
+			// timeLimitDesc.append(time.hour >= 12 ? map.getString(R.string.osmand_parking_pm) :
+			// map.getString(R.string.osmand_parking_am));
+			// }
+			timeLimitDesc.append(ctx.getString(R.string.osmand_parking_position_description_add) + " ");
+			timeLimitDesc.append(getFormattedTime(getParkingTime(),ctx));
+		}
+		return ctx.getString(R.string.osmand_parking_position_description, timeLimitDesc.toString());
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
index e2605b3e0d..556ea0b926 100644
--- a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
+++ b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
@@ -33,6 +33,11 @@ public class DirectionDrawable extends Drawable {
 		arrowImage = iconsCache.getIcon(resourceId, clrId);		
 	}
 
+	public void setImage(int resourceId){
+		IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
+		arrowImage = iconsCache.getIcon(resourceId, 0);
+	}
+
 
 	public DirectionDrawable(Context ctx, float width, float height) {
 		this.ctx = ctx;
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmAndMapLayersView.java b/OsmAnd/src/net/osmand/plus/views/OsmAndMapLayersView.java
index ca3dd7e2e8..d21ced8e20 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmAndMapLayersView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmAndMapLayersView.java
@@ -14,22 +14,23 @@ public class OsmAndMapLayersView extends View {
 
 	public OsmAndMapLayersView(Context context, AttributeSet attrs) {
 		super(context, attrs);
-		init();
 
 	}
 
 	public OsmAndMapLayersView(Context context) {
 		super(context);
-		init();
 	}
-
-	private void init() {
-		mapView = new OsmandMapTileView();
-		mapView.initView(this);
+	
+	public void setMapView(OsmandMapTileView mapView) {
+		this.mapView = mapView;
+		mapView.setView(this);
 	}
 
 	@Override
 	public boolean onTrackballEvent(MotionEvent event) {
+		if(mapView == null) {
+			return super.onTrackballEvent(event);
+		}
 		Boolean r = mapView.onTrackballEvent(event);
 		if(r == null) {
 			return super.onTrackballEvent(event);
@@ -39,6 +40,9 @@ public class OsmAndMapLayersView extends View {
 	
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if(mapView == null) {
+			return super.onKeyDown(keyCode, event);
+		}
 		Boolean r = mapView.onKeyDown(keyCode, event);
 		if(r == null) {
 			return super.onKeyDown(keyCode, event);
@@ -48,11 +52,17 @@ public class OsmAndMapLayersView extends View {
 	
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
+		if(mapView == null) {
+			return super.onTouchEvent(event);
+		}
 		return mapView.onTouchEvent(event);
 	}
 	
 	@Override
 	protected void onDraw(Canvas canvas) {
+		if(mapView == null) {
+			return;
+		}
 		boolean nightMode = mapView.getApplication().getDaynightHelper().isNightMode();
 		DrawSettings drawSettings = new DrawSettings(nightMode, false);
 		mapView.drawOverMap(canvas, mapView.getCurrentRotatedTileBox().copy(), drawSettings);
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmAndMapSurfaceView.java b/OsmAnd/src/net/osmand/plus/views/OsmAndMapSurfaceView.java
index 845f5096f3..844628b4b7 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmAndMapSurfaceView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmAndMapSurfaceView.java
@@ -1,6 +1,8 @@
 package net.osmand.plus.views;
 
+import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import android.content.Context;
+import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -23,29 +25,49 @@ public class OsmAndMapSurfaceView extends SurfaceView implements Callback {
 		super(context);
 		init();
 	}
+	
+	@Override
+	public void setOnClickListener(OnClickListener l) {
+		super.setOnClickListener(l);
+		this.onClickListener = l;
+	}
+	
 
 	private void init() {
 		getHolder().addCallback(this);	
-		mapView = new OsmandMapTileView();
-		mapView.initView(this);
 	}
+	
 
 	@Override
 	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-		mapView.refreshMap();
+		if(mapView != null) {
+			mapView.refreshMap();
+		}
 	}
 
 	@Override
 	public void surfaceCreated(SurfaceHolder holder) {
-		mapView.refreshMap();
+		if(mapView != null) {
+			mapView.refreshMap();
+		}
 	}
 
 	@Override
 	public void surfaceDestroyed(SurfaceHolder holder) {
 	}
 	
+	
+
+	public void setMapView(OsmandMapTileView mapView) {
+		this.mapView = mapView;
+		mapView.setView(this);
+	}
+
 	@Override
 	public boolean onTrackballEvent(MotionEvent event) {
+		if(mapView == null) {
+			return super.onTrackballEvent(event);
+		}
 		Boolean r = mapView.onTrackballEvent(event);
 		if(r == null) {
 			return super.onTrackballEvent(event);
@@ -53,13 +75,11 @@ public class OsmAndMapSurfaceView extends SurfaceView implements Callback {
 		return r;
 	}
 	
-	@Override
-	public void setOnClickListener(OnClickListener l) {
-		super.setOnClickListener(l);
-		this.onClickListener = l;
-	}
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if(mapView == null) {
+			return super.onKeyDown(keyCode, event);
+		}
 		Boolean r = mapView.onKeyDown(keyCode, event);
 		if(r == null) {
 			return super.onKeyDown(keyCode, event);
@@ -69,12 +89,22 @@ public class OsmAndMapSurfaceView extends SurfaceView implements Callback {
 	
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
-		if(onClickListener != null) {
+		if(mapView == null) {
 			return super.onTouchEvent(event);
 		}
 		return mapView.onTouchEvent(event);
 	}
 	
+	@Override
+	protected void onDraw(Canvas canvas) {
+		if(mapView == null) {
+			return;
+		}
+		boolean nightMode = mapView.getApplication().getDaynightHelper().isNightMode();
+		DrawSettings drawSettings = new DrawSettings(nightMode, false);
+		mapView.drawOverMap(canvas, mapView.getCurrentRotatedTileBox().copy(), drawSettings);
+	}
+	
 
 	public OsmandMapTileView getMapView() {
 		return mapView;
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 21b841584f..13d9f8bfc4 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -173,9 +173,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 
 	// ///////////////////////////// INITIALIZING UI PART ///////////////////////////////////
-	public void initView(View view) {
-		application = (OsmandApplication) view.getContext().getApplicationContext();
-		this.view = view;
+	public void init(Context ctx) {
+		application = (OsmandApplication) ctx.getApplicationContext();
 		paintGrayFill = new Paint();
 		paintGrayFill.setColor(Color.GRAY);
 		paintGrayFill.setStyle(Style.FILL);
@@ -204,28 +203,27 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		paintImg.setFilterBitmap(true);
 //		paintImg.setDither(true);
 
-		view.setClickable(true);
-		view.setLongClickable(true);
-		view.setFocusable(true);
-
-
 		handler = new Handler();
-
 		baseHandler = new Handler(application.getResourceManager().getRenderingBufferImageThread().getLooper());
-		
 		animatedDraggingThread = new AnimateDraggingMapThread(this);
-		gestureDetector = new GestureDetector(view.getContext(), new MapExplorer(this, new MapTileViewOnGestureListener()));
-		multiTouchSupport = new MultiTouchSupport(view.getContext(), new MapTileViewMultiTouchZoomListener());
+		gestureDetector = new GestureDetector(ctx, new MapExplorer(this, new MapTileViewOnGestureListener()));
+		multiTouchSupport = new MultiTouchSupport(ctx, new MapTileViewMultiTouchZoomListener());
 		gestureDetector.setOnDoubleTapListener(new MapTileViewOnDoubleTapListener());
 
-		WindowManager mgr = (WindowManager) view.getContext().getSystemService(Context.WINDOW_SERVICE);
+		WindowManager mgr = (WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE);
 		dm = new DisplayMetrics();
 		mgr.getDefaultDisplay().getMetrics(dm);
 		currentViewport = new RotatedTileBox.RotatedTileBoxBuilder().
-				setLocation(0, 0).setZoom(3).setPixelDimensions(view.getWidth(), view.getHeight()).build();
+				setLocation(0, 0).setZoom(3).setPixelDimensions(100, 100).build();
 		currentViewport.setDensity(dm.density);
 		currentViewport.setMapDensity(getSettingsMapDensity());
-
+	}
+	
+	public void setView(View view) {
+		this.view = view;
+		view.setClickable(true);
+		view.setLongClickable(true);
+		view.setFocusable(true);
 	}
 
 	public Boolean onKeyDown(int keyCode, KeyEvent event) {
@@ -469,6 +467,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	}
 
 	private void refreshMapInternal(DrawSettings drawSettings) {
+		if(view == null) {
+			return;
+		}
 		final float ratioy = mapPosition == OsmandSettings.BOTTOM_CONSTANT ? 0.85f : 0.5f;
 		final int cy = (int) (ratioy * view.getHeight());
 		if (currentViewport.getPixWidth() != view.getWidth() || currentViewport.getPixHeight() != view.getHeight() ||
@@ -605,7 +606,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 	// this method could be called in non UI thread
 	public void refreshMap(final boolean updateVectorRendering) {
-		if (view.isShown()) {
+		if (view != null && view.isShown()) {
 			boolean nightMode = application.getDaynightHelper().isNightMode();
 			DrawSettings drawSettings = new DrawSettings(nightMode, updateVectorRendering);
 			sendRefreshMapMsg(drawSettings, 20);
@@ -785,7 +786,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		handler.post(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(view.getContext(), msg, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
+				AccessibleToast.makeText(application, msg, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
 			}
 		});
 	}
@@ -815,7 +816,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			final int newZoom = getZoom();
 			if (application.accessibilityEnabled()) {
 				if (newZoom != initialViewport.getZoom()) {
-					showMessage(view.getContext().getString(R.string.zoomIs) + " " + newZoom); //$NON-NLS-1$
+					showMessage(application.getString(R.string.zoomIs) + " " + newZoom); //$NON-NLS-1$
 				} else {
 					final LatLon p1 = initialViewport.getLatLonFromPixel(x1, y1);
 					final LatLon p2 = initialViewport.getLatLonFromPixel(x2, y2);
@@ -977,12 +978,14 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	}
 
 
-	public Context getContext() {
-		return view.getContext();
-	}
+	
 
 	public Resources getResources() {
-		return view.getResources();
+		return application.getResources();
+	}
+	
+	public Context getContext() {
+		return view.getContext();
 	}
 
 	public int getHeight() {
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/FloatingActionButton.java b/OsmAnd/src/net/osmand/plus/views/controls/FloatingActionButton.java
deleted file mode 100644
index 25eb00158f..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/FloatingActionButton.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.OvershootInterpolator;
-import android.widget.FrameLayout;
-
-/*
-* Created by John Hogan
-* https://gist.github.com/Jogan/9def6110edf3247825c9
- */
-
-@SuppressLint("NewApi")
-public class FloatingActionButton extends View {
-
-	final static OvershootInterpolator overshootInterpolator = new OvershootInterpolator();
-	final static AccelerateInterpolator accelerateInterpolator = new AccelerateInterpolator();
-
-	Context context;
-	Paint mButtonPaint;
-	Paint mDrawablePaint;
-	Bitmap mBitmap;
-	boolean mHidden = false;
-
-	public FloatingActionButton(Context context) {
-		super(context);
-		this.context = context;
-		init(Color.WHITE);
-	}
-
-	public void setFloatingActionButtonColor(int FloatingActionButtonColor) {
-		init(FloatingActionButtonColor);
-	}
-
-	public void setFloatingActionButtonDrawable(Drawable FloatingActionButtonDrawable) {
-		mBitmap = ((BitmapDrawable) FloatingActionButtonDrawable).getBitmap();
-		invalidate();
-	}
-
-	public void init(int FloatingActionButtonColor) {
-		setWillNotDraw(false);
-		setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-
-		mButtonPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-		mButtonPaint.setColor(FloatingActionButtonColor);
-		mButtonPaint.setStyle(Paint.Style.FILL);
-		mButtonPaint.setShadowLayer(10.0f, 0.0f, 3.5f, Color.argb(100, 0, 0, 0));
-		mDrawablePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-		invalidate();
-	}
-
-	@Override
-	protected void onDraw(Canvas canvas) {
-		setClickable(true);
-		canvas.drawCircle(getWidth() / 2, getHeight() / 2, (float) (getWidth() / 2.6), mButtonPaint);
-		canvas.drawBitmap(mBitmap, (getWidth() - mBitmap.getWidth()) / 2,
-				(getHeight() - mBitmap.getHeight()) / 2, mDrawablePaint);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		if (event.getAction() == MotionEvent.ACTION_UP) {
-			setAlpha(1.0f);
-		} else if (event.getAction() == MotionEvent.ACTION_DOWN) {
-			setAlpha(0.6f);
-		}
-		return super.onTouchEvent(event);
-	}
-
-	public void hideFloatingActionButton() {
-		if (!mHidden) {
-			ObjectAnimator scaleX = ObjectAnimator.ofFloat(this, "scaleX", 1, 0);
-			ObjectAnimator scaleY = ObjectAnimator.ofFloat(this, "scaleY", 1, 0);
-			AnimatorSet animSetXY = new AnimatorSet();
-			animSetXY.playTogether(scaleX, scaleY);
-			animSetXY.setInterpolator(accelerateInterpolator);
-			animSetXY.setDuration(100);
-			animSetXY.start();
-			mHidden = true;
-			setVisibility(View.GONE);
-		}
-	}
-
-	public void showFloatingActionButton() {
-		if (mHidden) {
-			ObjectAnimator scaleX = ObjectAnimator.ofFloat(this, "scaleX", 0, 1);
-			ObjectAnimator scaleY = ObjectAnimator.ofFloat(this, "scaleY", 0, 1);
-			AnimatorSet animSetXY = new AnimatorSet();
-			animSetXY.playTogether(scaleX, scaleY);
-			animSetXY.setInterpolator(overshootInterpolator);
-			animSetXY.setDuration(200);
-			animSetXY.start();
-			mHidden = false;
-			setVisibility(View.VISIBLE);
-		}
-	}
-
-	public boolean isHidden() {
-		return mHidden;
-	}
-
-	static public class Builder {
-		private FrameLayout.LayoutParams params;
-		private final Activity activity;
-		int gravity = Gravity.BOTTOM | Gravity.RIGHT; // default bottom right
-		Drawable drawable;
-		int color = Color.WHITE;
-		int size = 0;
-		float scale = 0;
-
-		public Builder(Activity context) {
-			scale = context.getResources().getDisplayMetrics().density;
-			size = convertToPixels(72, scale); // default size is 72dp by 72dp
-			params = new FrameLayout.LayoutParams(size, size);
-			params.gravity = gravity;
-
-			this.activity = context;
-		}
-
-		/**
-		 * Sets the gravity for the FAB
-		 */
-		public Builder withGravity(int gravity) {
-			this.gravity = gravity;
-			return this;
-		}
-
-		/**
-		 * Sets the margins for the FAB in dp
-		 */
-		public Builder withMargins(int left, int top, int right, int bottom) {
-			params.setMargins(
-					convertToPixels(left, scale),
-					convertToPixels(top, scale),
-					convertToPixels(right, scale),
-					convertToPixels(bottom, scale));
-			return this;
-		}
-
-		/**
-		 * Sets the FAB drawable
-		 */
-		public Builder withDrawable(final Drawable drawable) {
-			this.drawable = drawable;
-			return this;
-		}
-
-		/**
-		 * Sets the FAB color
-		 */
-		public Builder withButtonColor(final int color) {
-			this.color = color;
-			return this;
-		}
-
-		/**
-		 * Sets the FAB size in dp
-		 */
-		public Builder withButtonSize(int size) {
-			size = convertToPixels(size, scale);
-			params = new FrameLayout.LayoutParams(size, size);
-			return this;
-		}
-
-		public FloatingActionButton create() {
-			final FloatingActionButton button = new FloatingActionButton(activity);
-			button.setFloatingActionButtonColor(this.color);
-			button.setFloatingActionButtonDrawable(this.drawable);
-			params.gravity = this.gravity;
-			ViewGroup root = (ViewGroup) activity.findViewById(android.R.id.content);
-			root.addView(button, params);
-			return button;
-		}
-
-		// The calculation (value * scale + 0.5f) is a widely used to convert to dps to pixel units
-		// based on density scale
-		// see developer.android.com (Supporting Multiple Screen Sizes)
-		private int convertToPixels(int dp, float scale){
-			return (int) (dp * scale + 0.5f) ;
-		}
-	}
-}