diff --git a/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java b/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
index 5751f0c1cb..5f798decc8 100644
--- a/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
+++ b/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
@@ -8,16 +8,21 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import net.osmand.PlatformUtil;
 import net.osmand.util.Algorithms;
-import net.osmand.util.LIFOBlockingDeque;
 
 import org.apache.commons.logging.Log;
 
@@ -106,14 +111,34 @@ public class MapTileDownloader {
 	
 	
 	public MapTileDownloader(int numberOfThreads){
+		
 		threadPoolExecutor = new ThreadPoolExecutor(numberOfThreads, numberOfThreads, TILE_DOWNLOAD_SECONDS_TO_WORK, 
-				TimeUnit.SECONDS, new LIFOBlockingDeque<Runnable>());
+				TimeUnit.SECONDS, createQueue());
 		// 1.6 method but very useful to kill non-running threads
 //		threadPoolExecutor.allowCoreThreadTimeOut(true);
 		pendingToDownload = Collections.synchronizedSet(new HashSet<File>());
 		currentlyDownloaded = Collections.synchronizedSet(new HashSet<File>());
 		
 	}
+
+	protected BlockingQueue<Runnable> createQueue() {
+		boolean loaded = false;
+		try {
+			Class<?> cl = Class.forName("java.util.concurrent.LinkedBlockingDeque");
+			loaded = cl != null;
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+		if(!loaded) {
+			// for Android 2.2
+			return new LinkedBlockingQueue<Runnable>();
+		}
+		return createDeque();
+	}
+
+	protected static BlockingQueue<Runnable> createDeque() {
+		return new net.osmand.util.LIFOBlockingDeque<Runnable>();
+	}
 	
 	public void addDownloaderCallback(IMapDownloaderCallback callback){
 		callbacks.add(callback);
diff --git a/OsmAnd/res/drawable-large/Thumbs.db b/OsmAnd/res/drawable-large/Thumbs.db
new file mode 100644
index 0000000000..c3d48fe357
Binary files /dev/null and b/OsmAnd/res/drawable-large/Thumbs.db differ
diff --git a/OsmAnd/res/layout/action_item.xml b/OsmAnd/res/layout/action_item.xml
index 775fcce695..5f0bf408fc 100644
--- a/OsmAnd/res/layout/action_item.xml
+++ b/OsmAnd/res/layout/action_item.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:gravity="center_vertical|center_horizontal"
-	android:paddingTop="0dip"
-	android:paddingBottom="0dip"
-	android:paddingLeft="12dip"
-	android:paddingRight="12dip" 
-	android:clickable="true"
-	android:background="@drawable/quickaction_slider_btn">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical|center_horizontal"
+    android:paddingTop="0dip"
+    android:paddingBottom="0dip"
+    android:paddingLeft="12dip"
+    android:paddingRight="12dip"
+    android:clickable="true"
+    android:background="@drawable/quickaction_slider_btn">
 
-	<ImageView
-		android:id="@+id/icon" 
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"/>
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical|center_horizontal"
+        android:textSize="12sp"
+        android:textColor="#666" />
 
-	<TextView 
-		android:id="@+id/title"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent" 
-		android:gravity="center_vertical|center_horizontal"
-		android:textSize="12sp"
-		android:textColor="#666"/>
-		
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/alert.xml b/OsmAnd/res/layout/alert.xml
index 817467e1d2..a1f16b2867 100644
--- a/OsmAnd/res/layout/alert.xml
+++ b/OsmAnd/res/layout/alert.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/layout"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical">
+    android:id="@+id/layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
-	<TextView android:id="@+id/message" android:focusable="true"
-		android:layout_marginLeft="4dp" android:layout_marginRight="4dp"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:textSize="18sp" android:gravity="fill_horizontal"/>
+    <TextView
+        android:id="@+id/message"
+        android:focusable="true"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textSize="18sp"
+        android:gravity="fill_horizontal" />
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/animate_route.xml b/OsmAnd/res/layout/animate_route.xml
index b6d0c1a576..e86bf89bb6 100644
--- a/OsmAnd/res/layout/animate_route.xml
+++ b/OsmAnd/res/layout/animate_route.xml
@@ -1,9 +1,13 @@
 <?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="fill_parent" android:orientation="vertical">
-<RadioGroup  android:layout_width="fill_parent" android:layout_height="wrap_content">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <RadioGroup
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
         <RadioButton
             android:id="@+id/radio_route"
             android:text="@string/animate_routing_route"
@@ -12,30 +16,63 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_weight="1" />
-		<RadioButton
+
+        <RadioButton
             android:id="@+id/radio_gpx"
             android:text="@string/animate_routing_gpx"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_weight="1" />
-        
-	</RadioGroup>
-    <LinearLayout  android:layout_width="fill_parent" android:id="@+id/layout_animate_gpx"
-		  android:layout_height="fill_parent" android:orientation="vertical" android:visibility="gone">
-    
-  <TextView android:text="@string/select_animate_speedup" android:gravity="left"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/>
-  <SeekBar android:id="@+id/Speedup" android:layout_width="fill_parent" android:layout_height="wrap_content" 
-      android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/>
-  <LinearLayout 
-  			android:layout_width="fill_parent" android:layout_height="wrap_content" 
-  			android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp">
-  	<TextView android:text="10" android:gravity="left" android:layout_weight="0.5" android:id="@+id/MinSpeedup"
-  			android:layout_width="wrap_content" android:layout_height="wrap_content"/> 
-  	<TextView android:text="15" android:gravity="right" android:layout_weight="0.5" android:id="@+id/MaxSpeedup"
-  			android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-  </LinearLayout>
-  </LinearLayout>
+
+    </RadioGroup>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:id="@+id/layout_animate_gpx"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <TextView
+            android:text="@string/select_animate_speedup"
+            android:gravity="left"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="5dp" />
+
+        <SeekBar
+            android:id="@+id/Speedup"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="5dp" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="5dp">
+
+            <TextView
+                android:text="10"
+                android:gravity="left"
+                android:layout_weight="0.5"
+                android:id="@+id/MinSpeedup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:text="15"
+                android:gravity="right"
+                android:layout_weight="0.5"
+                android:id="@+id/MaxSpeedup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/calculate_route.xml b/OsmAnd/res/layout/calculate_route.xml
index 894e9ac3c9..e62075b0bd 100644
--- a/OsmAnd/res/layout/calculate_route.xml
+++ b/OsmAnd/res/layout/calculate_route.xml
@@ -2,15 +2,24 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
-	<TextView android:id="@+id/ValidateTextView" android:textSize="16sp"  android:visibility="gone"  android:layout_width="fill_parent" android:layout_height="wrap_content" 
-	    	android:text="" android:gravity="center" android:textColor="@color/color_invalid"></TextView>
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/ValidateTextView"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text=""
+        android:textColor="@color/color_invalid"
+        android:textSize="16sp"
+        android:visibility="gone" />
+
     <LinearLayout
         android:id="@+id/LinearLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
 
     </LinearLayout>
@@ -20,24 +29,23 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
         android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp" >
+        android:layout_marginTop="5dp">
 
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="3dp"
                     android:text="@string/route_from"
-                    android:textSize="18sp" >
-                </TextView>
+                    android:textSize="18sp" />
 
                 <Spinner
                     android:id="@+id/FromSpinner"
@@ -45,8 +53,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
-					android:textSize="18sp" >
-                </Spinner>
+                    android:textSize="18sp" />
             </LinearLayout>
 
             <TextView
@@ -56,19 +63,19 @@
                 android:layout_marginLeft="3dp"
                 android:gravity="left"
                 android:textSize="18sp" />
-                
-            
-             <LinearLayout
+
+
+            <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="3dp"
                     android:text="@string/route_to"
-                    android:textSize="18sp" >
-                    
+                    android:textSize="18sp">
+
                 </TextView>
 
                 <Spinner
@@ -76,11 +83,10 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp" 
-                    android:textSize="18sp" >
-                </Spinner>
+                    android:layout_marginRight="5dp"
+                    android:textSize="18sp" />
             </LinearLayout>
-            
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/OsmAnd/res/layout/change_order_item.xml b/OsmAnd/res/layout/change_order_item.xml
index c5745ca82b..551605f45b 100644
--- a/OsmAnd/res/layout/change_order_item.xml
+++ b/OsmAnd/res/layout/change_order_item.xml
@@ -7,10 +7,15 @@
     android:layout_marginTop="2dip"
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
-    android:weightSum="1" android:background="@color/color_white">
+    android:weightSum="1"
+    android:background="@color/color_white">
+
+    <ImageButton
+        android:src="@drawable/av_download"
+        android:id="@+id/down"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
-	<ImageButton android:src="@drawable/av_download" android:id="@+id/down" android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"/>
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
@@ -19,9 +24,13 @@
         android:gravity="center_vertical"
         android:text="@string/layer_poi"
         android:textSize="18sp"
-        android:textColor="@color/color_black" android:layout_weight="1"/>
-    <ImageButton android:src="@drawable/av_upload" android:id="@+id/up" 
+        android:textColor="@color/color_black"
+        android:layout_weight="1" />
+
+    <ImageButton
+        android:src="@drawable/av_upload"
+        android:id="@+id/up"
         android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/check_item_rel.xml b/OsmAnd/res/layout/check_item_rel.xml
index 963005c60f..d646c5a9e3 100644
--- a/OsmAnd/res/layout/check_item_rel.xml
+++ b/OsmAnd/res/layout/check_item_rel.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical" >
+    android:layout_gravity="center_vertical">
 
     <CheckBox
         android:id="@+id/check_item"
@@ -14,6 +14,6 @@
         android:layout_marginTop="3dp"
         android:layout_marginBottom="3dp"
         android:focusable="false"
-        android:gravity="center_vertical"        />
+        android:gravity="center_vertical" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/configuration_dialog.xml b/OsmAnd/res/layout/configuration_dialog.xml
index 9fea56916e..9616a88e83 100644
--- a/OsmAnd/res/layout/configuration_dialog.xml
+++ b/OsmAnd/res/layout/configuration_dialog.xml
@@ -2,16 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <LinearLayout
-        android:orientation="horizontal" 
-        android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" 
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
         android:id="@+id/TopBar" />
+
     <ListView
         android:id="@android:id/list"
         style="@style/OsmandListView"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
-    </ListView>
-    	
+        android:layout_height="fill_parent"></ListView>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/download_build_list_item.xml b/OsmAnd/res/layout/download_build_list_item.xml
index a961c2f760..da648ef5d9 100644
--- a/OsmAnd/res/layout/download_build_list_item.xml
+++ b/OsmAnd/res/layout/download_build_list_item.xml
@@ -1,11 +1,22 @@
 <?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">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
 
-	<TextView android:id="@+id/download_tag" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
-		 android:layout_weight="1" android:textSize="19sp"></TextView>
+    <TextView
+        android:id="@+id/download_tag"
+        android:gravity="center_vertical"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="19sp"></TextView>
 
-	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"
-		android:layout_height="wrap_content" android:textSize="19sp" ></TextView>
+    <TextView
+        android:id="@+id/download_descr"
+        android:layout_marginLeft="3dp"
+        android:gravity="center_vertical"
+        android:layout_width="105dp"
+        android:layout_height="wrap_content"
+        android:textSize="19sp"></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/download_index.xml b/OsmAnd/res/layout/download_index.xml
index f36b0549b0..0e0cd8badc 100644
--- a/OsmAnd/res/layout/download_index.xml
+++ b/OsmAnd/res/layout/download_index.xml
@@ -3,7 +3,7 @@
     android:id="@+id/MainLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
 
     <EditText
diff --git a/OsmAnd/res/layout/download_index_list_item.xml b/OsmAnd/res/layout/download_index_list_item.xml
index fb6485a6f9..6711732ebe 100644
--- a/OsmAnd/res/layout/download_index_list_item.xml
+++ b/OsmAnd/res/layout/download_index_list_item.xml
@@ -1,15 +1,38 @@
 <?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:paddingTop="1dp" android:paddingBottom="1dp" android:paddingRight="8dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="1dp"
+    android:paddingBottom="1dp"
+    android:paddingRight="8dp">
 
-	<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
-		<CheckBox android:id="@+id/check_download_item" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:gravity="center_vertical" android:focusable="false" />
-	</LinearLayout>
-	<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
-		android:maxLines="7" android:layout_weight="1" style="@style/ListText.Small"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent">
 
-	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" style="@style/ListText.Small"/>
+        <CheckBox
+            android:id="@+id/check_download_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:focusable="false" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/download_item"
+        android:gravity="center_vertical"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:maxLines="7"
+        android:layout_weight="1"
+        style="@style/ListText.Small" />
+
+    <TextView
+        android:id="@+id/download_descr"
+        android:layout_marginLeft="3dp"
+        android:gravity="right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/ListText.Small" />
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/download_tiles.xml b/OsmAnd/res/layout/download_tiles.xml
index 6f1d444e0a..585a90f330 100644
--- a/OsmAnd/res/layout/download_tiles.xml
+++ b/OsmAnd/res/layout/download_tiles.xml
@@ -1,25 +1,63 @@
 <?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="fill_parent" android:orientation="vertical">
-  <TextView android:text="@string/select_max_zoom_preload_area" android:gravity="center"
-  			android:layout_width="fill_parent" android:layout_height="wrap_content" 
-  			android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/> 
-  <SeekBar android:id="@+id/ZoomToDownload" android:layout_width="fill_parent" android:layout_height="wrap_content" 
-      android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp"/>
-  <LinearLayout 
-  			android:layout_width="fill_parent" android:layout_height="wrap_content" 
-  			android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp">
-  	<TextView android:text="10" android:gravity="left" android:layout_weight="0.5" android:id="@+id/MinZoom"
-  			android:layout_width="wrap_content" android:layout_height="wrap_content"/> 
-  	<TextView android:text="15" android:gravity="right" android:layout_weight="0.5" android:id="@+id/MaxZoom"
-  			android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-  </LinearLayout>
-  <TextView android:text="@string/tiles_to_download_estimated_size" android:gravity="center" android:id="@+id/DownloadDescription"
-  			android:layout_width="fill_parent" android:layout_height="wrap_content"/>			 
-  <ImageView android:layout_width="fill_parent" android:layout_height="fill_parent"
-  			 android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="5dp" 
-  			 android:layout_marginBottom="5dp" 
-  				android:id="@+id/AreaPreview"/>   
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:text="@string/select_max_zoom_preload_area"
+        android:gravity="center"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="5dp" />
+
+    <SeekBar
+        android:id="@+id/ZoomToDownload"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="5dp" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="5dp">
+
+        <TextView
+            android:text="10"
+            android:gravity="left"
+            android:layout_weight="0.5"
+            android:id="@+id/MinZoom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:text="15"
+            android:gravity="right"
+            android:layout_weight="0.5"
+            android:id="@+id/MaxZoom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <TextView
+        android:text="@string/tiles_to_download_estimated_size"
+        android:gravity="center"
+        android:id="@+id/DownloadDescription"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:id="@+id/AreaPreview" />
 </LinearLayout>
diff --git a/OsmAnd/res/layout/drawer_list_doubleitem.xml b/OsmAnd/res/layout/drawer_list_doubleitem.xml
index 62df52bd38..7d45ba680c 100644
--- a/OsmAnd/res/layout/drawer_list_doubleitem.xml
+++ b/OsmAnd/res/layout/drawer_list_doubleitem.xml
@@ -1,43 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:paddingLeft="24dp"
-              android:paddingRight="16dp">
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="24dp"
+    android:paddingRight="16dp">
 
-    <LinearLayout android:layout_width="0dp"
-                  android:layout_weight="1"
-                  android:orientation="horizontal"
-                  android:layout_height="48dp">
-        <TextView android:id="@+id/title"
-                  android:textSize="18sp"
-                  android:layout_width="wrap_content"
-                  android:layout_weight="1"
-                  android:layout_gravity="center_vertical"
-                  android:gravity="center_vertical"
-                  android:maxLines="2"
-                  android:layout_height="wrap_content"/>
-        <TextView android:id="@+id/descr"
-                     android:textSize="14sp"
-                     android:layout_weight="1"
-                     android:textColor="#bebebe"
-                     android:layout_width="64dp"
-                     android:layout_marginLeft="4dp"
-                     android:gravity="right"
-                     android:maxLines="1"
-                     android:ellipsize="end"
-                     android:layout_gravity="center_vertical|right"
-                     android:layout_height="wrap_content"/>
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:layout_height="48dp">
+
+        <TextView
+            android:id="@+id/title"
+            android:textSize="18sp"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:maxLines="2"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/descr"
+            android:textSize="14sp"
+            android:layout_weight="1"
+            android:textColor="#bebebe"
+            android:layout_width="64dp"
+            android:layout_marginLeft="4dp"
+            android:gravity="right"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:layout_gravity="center_vertical|right"
+            android:layout_height="wrap_content" />
     </LinearLayout>
-  <CheckBox
+
+    <CheckBox
         android:id="@+id/check_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="11dp"
         android:focusable="false"
         android:layout_gravity="center_vertical" />
-    
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/drawer_list_item.xml b/OsmAnd/res/layout/drawer_list_item.xml
index 018fc14f55..bda3867a34 100644
--- a/OsmAnd/res/layout/drawer_list_item.xml
+++ b/OsmAnd/res/layout/drawer_list_item.xml
@@ -18,16 +18,16 @@
         tools:src="@drawable/ic_action_info_dark" />
 
     <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginLeft="11dp"
-            tools:text="Some title text" />
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="11dp"
+        tools:text="Some title text" />
 
     <CheckBox
         android:id="@+id/check_item"
diff --git a/OsmAnd/res/layout/drawer_list_radius.xml b/OsmAnd/res/layout/drawer_list_radius.xml
index e4b1cd3ab4..92878393ae 100644
--- a/OsmAnd/res/layout/drawer_list_radius.xml
+++ b/OsmAnd/res/layout/drawer_list_radius.xml
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content"
-			  android:layout_marginTop="5dp"
-			  android:minHeight="40dp"
-			  android:layout_marginBottom="5dp">
-			  
-	 <ImageView android:id="@+id/waypoint_icon"
-               android:layout_marginLeft="8dp"
-               android:layout_height="wrap_content"
-               android:layout_width="wrap_content"
-               android:layout_gravity="center_vertical"/>
-    
-			  
-	<TextView android:id="@+id/title"
-			  android:text="@string/search_radius_proximity"
-			  android:layout_width="0dp"
-			  android:layout_marginLeft="8dp"
-			  android:layout_height="wrap_content"
-			  android:layout_weight="1"
-			  android:layout_gravity="center_vertical"
-			  android:textSize="20sp"/>
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="5dp"
+    android:minHeight="40dp"
+    android:layout_marginBottom="5dp">
+
+    <ImageView
+        android:id="@+id/waypoint_icon"
+        android:layout_marginLeft="8dp"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="center_vertical" />
+
+
+    <TextView
+        android:id="@+id/title"
+        android:text="@string/search_radius_proximity"
+        android:layout_width="0dp"
+        android:layout_marginLeft="8dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/descr"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:textColor="@color/sherpafy_selection"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="8dp" />
 
-	<TextView android:id="@+id/descr"
-			  android:layout_width="wrap_content"
-			  android:layout_height="wrap_content"
-			  android:textSize="20sp"
-			  android:textColor="@color/sherpafy_selection"
-			  android:layout_gravity="center_vertical"
-			  android:layout_marginRight="8dp"/>
-	
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/drawer_list_sub_header.xml b/OsmAnd/res/layout/drawer_list_sub_header.xml
index b25762c5a7..4e5fc2e781 100644
--- a/OsmAnd/res/layout/drawer_list_sub_header.xml
+++ b/OsmAnd/res/layout/drawer_list_sub_header.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:paddingLeft="24dp"  
-              android:paddingBottom="4dp">
-    <TextView android:id="@+id/title"
-              android:layout_weight="1"
-              android:layout_width="0dp"
-              android:layout_height="36dp"
-              android:capitalize="characters"
-              android:inputType="textCapCharacters"
-              android:textColor="#858585"
-              android:textSize="14sp"
-              android:ellipsize="end"
-              android:gravity="left|bottom"/>
-              <!-- android:maxLines="2" -->
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:paddingBottom="4dp"
+    android:paddingLeft="24dp">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:layout_weight="1"
+        android:capitalize="characters"
+        android:ellipsize="end"
+        android:gravity="left|bottom"
+        android:inputType="textCapCharacters"
+        android:textColor="#858585"
+        android:textSize="14sp" />
+    <!-- android:maxLines="2" -->
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml
index aef8b3823d..de61bc44fd 100644
--- a/OsmAnd/res/layout/editing_poi.xml
+++ b/OsmAnd/res/layout/editing_poi.xml
@@ -1,213 +1,249 @@
 <?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">
-
-<LinearLayout
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent" >
 
-<TextView
-    android:id="@+id/LinkToOsmDoc"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="5dp"
-    android:text="@string/create_poi_link_to_osm_doc" />
-
-<TableLayout  android:layout_width="fill_parent" android:layout_height="wrap_content"
-    android:stretchColumns="1" >
-<TableRow>
-    <TextView
-        android:id="@+id/TextView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:text="@string/poi_dialog_name" />
-    <!-- bug with width set it to 100 -->
+        android:orientation="vertical" >
 
-    <EditText
-        android:id="@+id/Name"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:text="" >
+        <TextView
+            android:id="@+id/LinkToOsmDoc"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="@string/create_poi_link_to_osm_doc" />
 
-        <requestFocus />
-    </EditText>
-</TableRow>
-<TableRow>
-    <Button
-        android:id="@+id/TypeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="&lt;Type>" />
+        <TableLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:stretchColumns="1" >
 
-    <AutoCompleteTextView
-        android:id="@+id/Type"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:text="" />
-</TableRow>
+            <TableRow>
 
-<TableRow>
-    <Button
-        android:id="@+id/OpenHoursButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/poi_dialog_opening_hours" />
+                <TextView
+                    android:id="@+id/TextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/poi_dialog_name" />
+                <!-- bug with width set it to 100 -->
 
-    <EditText
-        android:id="@+id/OpeningHours"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:hint="Mo-Su 08:00-20:00"
-        android:text="" >
-    </EditText>
-</TableRow>
+                <EditText
+                    android:id="@+id/Name"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:minWidth="250dp"
+                    android:text="" >
 
-<TableRow>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:text="@string/street_name" />
+                    <requestFocus />
+                </EditText>
+            </TableRow>
 
-    <EditText
-        android:id="@+id/StreetName"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp" >
-    </EditText>
-</TableRow>
-<TableRow>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:text="@string/hno" />
+            <TableRow>
 
-    <EditText
-        android:id="@+id/HouseNumber"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp" >
-    </EditText>
-</TableRow> 
+                <Button
+                    android:id="@+id/TypeButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="&lt;Type>" />
 
-<TableRow>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:text="@string/phone" />
-    <EditText
-        android:id="@+id/Phone"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:hint="0123456789"
-        android:inputType="phone" >
-    </EditText>
-</TableRow>
+                <AutoCompleteTextView
+                    android:id="@+id/Type"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:minWidth="250dp"
+                    android:text="" />
+            </TableRow>
 
-<TableRow>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:text="@string/website" />
+            <TableRow>
 
-    <EditText
-        android:id="@+id/Website"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:hint="http://osmand.net" >
-    </EditText>
-</TableRow>
+                <Button
+                    android:id="@+id/OpenHoursButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/poi_dialog_opening_hours" />
 
-<TableRow>
-    <TextView
-        android:id="@+id/TextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:text="@string/poi_dialog_comment" />
+                <EditText
+                    android:id="@+id/OpeningHours"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:hint="Mo-Su 08:00-20:00"
+                    android:minWidth="250dp"
+                    android:text="" >
+                </EditText>
+            </TableRow>
 
-    <EditText
-        android:id="@+id/Comment"
-        android:layout_width="250dp"
-        android:minWidth="250dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:text="@string/poi_dialog_comment_default" >
-    </EditText>
-</TableRow>
+            <TableRow>
 
-<TableRow>
-    <CheckBox
-        android:id="@+id/CloseChangeset"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_span="2"
-        android:text="@string/close_changeset" />
-</TableRow>
-</TableLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/street_name" />
 
+                <EditText
+                    android:id="@+id/StreetName"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:minWidth="250dp" >
+                </EditText>
+            </TableRow>
 
+            <TableRow>
 
-<TableLayout 
-    android:id="@+id/advancedModeTable"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:stretchColumns="1"
-    android:visibility="gone">
-</TableLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/hno" />
 
-<LinearLayout android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+                <EditText
+                    android:id="@+id/HouseNumber"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:minWidth="250dp" >
+                </EditText>
+            </TableRow>
 
-    <Button
-        android:id="@+id/addTag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="150dp"
-        android:text="@string/btn_add_tag"
-        android:visibility="gone" />
+            <TableRow>
 
-    <Button
-        android:id="@+id/advancedMode"
-        android:layout_width="wrap_content"
-        android:minWidth="150dp"
-        android:layout_height="wrap_content"
-        android:text="@string/btn_advanced_mode" />
-</LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/phone" />
 
-<TextView android:text="@string/poi_dialog_other_tags_message" android:id="@+id/TextView" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
-<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" 
-	android:gravity="bottom|center">
-    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button>
-    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_commit" android:id="@+id/Commit"></Button>
-</LinearLayout>
-</LinearLayout>
-</ScrollView>
+                <EditText
+                    android:id="@+id/Phone"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:hint="0123456789"
+                    android:inputType="phone"
+                    android:minWidth="250dp" >
+                </EditText>
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/website" />
+
+                <EditText
+                    android:id="@+id/Website"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:hint="http://osmand.net"
+                    android:minWidth="250dp" >
+                </EditText>
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/TextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/poi_dialog_comment" />
+
+                <EditText
+                    android:id="@+id/Comment"
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:minWidth="250dp"
+                    android:text="@string/poi_dialog_comment_default" >
+                </EditText>
+            </TableRow>
+
+            <TableRow>
+
+                <CheckBox
+                    android:id="@+id/CloseChangeset"
+                    android:layout_width="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_span="2"
+                    android:text="@string/close_changeset" />
+            </TableRow>
+        </TableLayout>
+
+        <TableLayout
+            android:id="@+id/advancedModeTable"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:stretchColumns="1"
+            android:visibility="gone" >
+        </TableLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+
+            <Button
+                android:id="@+id/addTag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minWidth="150dp"
+                android:text="@string/btn_add_tag"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/advancedMode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minWidth="150dp"
+                android:text="@string/btn_advanced_mode" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/TextView"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="@string/poi_dialog_other_tags_message" />
+
+        <LinearLayout
+            android:id="@+id/LinearLayout"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:gravity="bottom|center"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/Cancel"
+                android:layout_width="125dp"
+                android:layout_height="wrap_content"
+                android:text="@string/default_buttons_cancel" >
+            </Button>
+
+            <Button
+                android:id="@+id/Commit"
+                android:layout_width="125dp"
+                android:layout_height="wrap_content"
+                android:text="@string/default_buttons_commit" >
+            </Button>
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_poi_filter.xml b/OsmAnd/res/layout/editing_poi_filter.xml
index 3761a5b150..1e0ebe7af2 100644
--- a/OsmAnd/res/layout/editing_poi_filter.xml
+++ b/OsmAnd/res/layout/editing_poi_filter.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:choiceMode="multipleChoice"
-		android:layout_height="fill_parent" style="@style/OsmandListView"></ListView>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <ListView
+        android:id="@android:id/list"
+        style="@style/OsmandListView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:choiceMode="multipleChoice" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_poi_filter_list.xml b/OsmAnd/res/layout/editing_poi_filter_list.xml
index eac56265ce..6b58341f50 100644
--- a/OsmAnd/res/layout/editing_poi_filter_list.xml
+++ b/OsmAnd/res/layout/editing_poi_filter_list.xml
@@ -1,14 +1,19 @@
 <?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:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
-  
-	<CheckBox android:id="@+id/filter_poi_check"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox>
-		
-		
-	<TextView android:id="@+id/filter_poi_label"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		style="@style/ListText"></TextView>
+
+    <CheckBox
+        android:id="@+id/filter_poi_check"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+
+    <TextView
+        android:id="@+id/filter_poi_label"
+        style="@style/ListText"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_tile_source.xml b/OsmAnd/res/layout/editing_tile_source.xml
index 9550e79d74..669b5439dc 100644
--- a/OsmAnd/res/layout/editing_tile_source.xml
+++ b/OsmAnd/res/layout/editing_tile_source.xml
@@ -1,19 +1,19 @@
 <?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_height="fill_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            
-            android:stretchColumns="1" >
+
+            android:stretchColumns="1">
 
             <TableRow>
 
@@ -28,31 +28,32 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
-                    android:text="" >
+                    android:text="">
 
                     <requestFocus />
                 </EditText>
             </TableRow>
 
-            <TableRow android:layout_width="fill_parent"
-            android:layout_height="wrap_content"> 
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/edit_tilesource_choose_existing" >
-                </TextView>
+                    android:text="@string/edit_tilesource_choose_existing"></TextView>
 
                 <Spinner
                     android:id="@+id/TileSourceSpinner"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp" >
-                </Spinner>
+                    android:layout_marginRight="5dp"></Spinner>
             </TableRow>
 
-            <TableRow android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -64,13 +65,13 @@
                     android:layout_width="180dp"
                     android:layout_height="wrap_content"
                     android:lines="5"
-    				android:minLines="2"
-                    android:text="" >
-                </EditText>
+                    android:minLines="2"
+                    android:text=""></EditText>
             </TableRow>
 
-            <TableRow android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -81,12 +82,12 @@
                     android:id="@+id/MinZoom"
                     android:layout_width="180dp"
                     android:layout_height="wrap_content"
-                    android:text="" >
-                </EditText>
+                    android:text=""></EditText>
             </TableRow>
 
-            <TableRow android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -97,29 +98,28 @@
                     android:id="@+id/MaxZoom"
                     android:layout_width="180dp"
                     android:layout_height="wrap_content"
-                    android:text="" >
-                </EditText>
+                    android:text=""></EditText>
             </TableRow>
 
-            <TableRow android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:text="@string/edit_tilesource_expiration_time" 
-                    />
+                    android:text="@string/edit_tilesource_expiration_time" />
 
                 <EditText
                     android:id="@+id/ExpirationTime"
                     android:layout_width="180dp"
                     android:layout_height="wrap_content"
-                    android:text="" >
-                </EditText>
+                    android:text=""></EditText>
             </TableRow>
 
-            <TableRow android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
                 <CheckBox
                     android:id="@+id/EllipticMercator"
diff --git a/OsmAnd/res/layout/expandable_list.xml b/OsmAnd/res/layout/expandable_list.xml
index a6d96a0d5e..d21d8aac68 100644
--- a/OsmAnd/res/layout/expandable_list.xml
+++ b/OsmAnd/res/layout/expandable_list.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/DescriptionText"
@@ -24,7 +24,6 @@
         android:layout_marginRight="0dp"
         android:layout_marginTop="0dp"
         android:layout_weight="1"
-        android:groupIndicator="@android:color/transparent" >
-    </ExpandableListView>
+        android:groupIndicator="@android:color/transparent"></ExpandableListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index d819751060..80d958f620 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="5dp"
     android:paddingLeft="4dp"
     android:paddingRight="4dp"
-    android:paddingTop="5dp" >
+    android:paddingTop="5dp">
 
     <ImageView
         android:id="@+id/explist_indicator"
@@ -24,14 +24,14 @@
         android:layout_marginTop="0dp"
         android:autoLink="web"
         android:gravity="center_vertical"
-        android:textSize="18sp">
-    </TextView>
-    
-        <LinearLayout
+        android:textSize="18sp"></TextView>
+
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="right" >
-		<CheckBox
+        android:layout_gravity="right">
+
+        <CheckBox
             android:id="@+id/check_item"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -39,6 +39,6 @@
             android:gravity="center_vertical"
             android:visibility="gone" />
     </LinearLayout>
-    
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/expandable_list_item_category_btn.xml b/OsmAnd/res/layout/expandable_list_item_category_btn.xml
index 57a87555b5..4eb673ba56 100644
--- a/OsmAnd/res/layout/expandable_list_item_category_btn.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category_btn.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="5dp"
     android:paddingLeft="4dp"
     android:paddingRight="4dp"
-    android:paddingTop="5dp" >
+    android:paddingTop="5dp">
 
     <ImageView
         android:id="@+id/explist_indicator"
@@ -24,13 +24,12 @@
         android:layout_marginLeft="8dp"
         android:layout_marginTop="0dp"
         android:gravity="center_vertical"
-        android:textSize="18sp">
-    </TextView>
-    
-        <LinearLayout
+        android:textSize="18sp"></TextView>
+
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right" >
+        android:layout_gravity="right">
 
         <ImageView
             android:id="@+id/check_item"
@@ -38,10 +37,9 @@
             android:layout_height="wrap_content"
             android:src="@drawable/ic_action_settings_dark"
             android:focusable="false"
-            android:gravity="center_vertical"
-            />
-        
+            android:gravity="center_vertical" />
+
     </LinearLayout>
-    
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fav_group_edit.xml b/OsmAnd/res/layout/fav_group_edit.xml
index 0693fc6cdc..35711533ab 100644
--- a/OsmAnd/res/layout/fav_group_edit.xml
+++ b/OsmAnd/res/layout/fav_group_edit.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="7dp"
     android:paddingRight="7dp"
-    android:stretchColumns="1" >
+    android:stretchColumns="1">
 
     <TableRow>
 
@@ -18,27 +18,24 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            />
+            android:layout_marginRight="5dp" />
     </TableRow>
 
     <TableRow
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/osmo_edit_color" >
-        </TextView>
+            android:text="@string/osmo_edit_color"></TextView>
 
         <Spinner
             android:id="@+id/ColorSpinner"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp" >
-        </Spinner>
+            android:layout_marginRight="5dp"></Spinner>
     </TableRow>
 
 </TableLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favourite_edit_dialog.xml
index d2fcd8c292..a9eaa2c80f 100644
--- a/OsmAnd/res/layout/favourite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favourite_edit_dialog.xml
@@ -1,17 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-	android:paddingRight="3dp" android:stretchColumns="1">
-  <TableRow >
-  	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" 
-  			android:text="@string/favourites_edit_dialog_name"/>
-  	<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-  			android:id="@+id/Name" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
-  </TableRow>
-  <TableRow>
-  	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" 
-  			android:text="@string/favourites_edit_dialog_category"/>
-  	<AutoCompleteTextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-  		android:id="@+id/Category" android:completionThreshold="1" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
-  </TableRow>
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="3dp"
+    android:paddingRight="3dp"
+    android:stretchColumns="1">
+
+    <TableRow>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/favourites_edit_dialog_name" />
+
+        <EditText
+            android:id="@+id/Name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textCapWords"
+            android:paddingLeft="3dp"
+            android:selectAllOnFocus="true" />
+    </TableRow>
+
+    <TableRow>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/favourites_edit_dialog_category" />
+
+        <AutoCompleteTextView
+            android:id="@+id/Category"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:completionThreshold="1"
+            android:inputType="textCapWords"
+            android:paddingLeft="3dp"
+            android:selectAllOnFocus="true" />
+    </TableRow>
 </TableLayout>
diff --git a/OsmAnd/res/layout/favourites_list_item.xml b/OsmAnd/res/layout/favourites_list_item.xml
index 32bcf856ce..1cdf302156 100644
--- a/OsmAnd/res/layout/favourites_list_item.xml
+++ b/OsmAnd/res/layout/favourites_list_item.xml
@@ -1,21 +1,38 @@
 <?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:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="5dp"
     android:paddingLeft="8dp"
     android:paddingRight="4dp"
     android:paddingTop="5dp">
-	
-	<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
-		<CheckBox android:id="@+id/check_item" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:gravity="center_vertical" android:focusable="false" android:visibility="gone"/>
-	</LinearLayout>
 
-	<ImageView android:id="@+id/favourite_icon" android:layout_width="25dp"
-		android:paddingRight="2dp" android:paddingTop="2dp" android:layout_height="fill_parent" />
-	
-	<TextView android:id="@+id/favourite_label" android:layout_width="wrap_content" android:layout_marginLeft="10dp"
-		android:layout_height="wrap_content" style="@style/ListText"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <CheckBox
+            android:id="@+id/check_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:focusable="false"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/favourite_icon"
+        android:layout_width="25dp"
+        android:paddingRight="2dp"
+        android:paddingTop="2dp"
+        android:layout_height="fill_parent" />
+
+    <TextView
+        android:id="@+id/favourite_label"
+        android:layout_width="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_height="wrap_content"
+        style="@style/ListText" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gl_surface.xml b/OsmAnd/res/layout/gl_surface.xml
index 5a93699ddb..d4a823c22a 100644
--- a/OsmAnd/res/layout/gl_surface.xml
+++ b/OsmAnd/res/layout/gl_surface.xml
@@ -2,6 +2,6 @@
 <android.opengl.GLSurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/glSurfaceView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
 </android.opengl.GLSurfaceView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_item_list_item.xml b/OsmAnd/res/layout/gpx_item_list_item.xml
index 572a2f4a04..1b20a3f4ea 100644
--- a/OsmAnd/res/layout/gpx_item_list_item.xml
+++ b/OsmAnd/res/layout/gpx_item_list_item.xml
@@ -6,17 +6,16 @@
     android:paddingBottom="4dp"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:paddingTop="4dp" >
+    android:paddingTop="4dp">
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <FrameLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" 
-            android:layout_marginLeft="3dp"
-            >
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3dp">
 
             <ImageView
                 android:id="@+id/icon"
@@ -32,8 +31,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginRight="3dp"
-                android:layout_marginLeft="2dp"  >
-            </TextView>
+                android:layout_marginLeft="2dp"></TextView>
         </FrameLayout>
 
         <TextView
@@ -44,8 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_weight="1"
-            android:layout_gravity="center_vertical" >
-        </TextView>
+            android:layout_gravity="center_vertical"></TextView>
     </LinearLayout>
 
     <TextView
@@ -54,7 +51,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:maxLines="25" >
-    </TextView>
+        android:maxLines="25"></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/layers_list_activity_item.xml b/OsmAnd/res/layout/layers_list_activity_item.xml
index edc2905ea3..d92bd97e78 100644
--- a/OsmAnd/res/layout/layers_list_activity_item.xml
+++ b/OsmAnd/res/layout/layers_list_activity_item.xml
@@ -12,22 +12,23 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dip"
-    	android:layout_marginBottom="4dip"
+        android:layout_marginBottom="4dip"
         android:gravity="center_vertical"
         android:text="@string/layer_poi"
         android:textSize="18sp"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
-    <LinearLayout android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="fill_parent">
 
 
-    <CheckBox
-        android:id="@+id/check_item"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:gravity="center_vertical" />
+        <CheckBox
+            android:id="@+id/check_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:focusable="false"
+            android:gravity="center_vertical" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_bigtextview.xml b/OsmAnd/res/layout/list_bigtextview.xml
index 3971c75ab4..7e7cf0bf2d 100644
--- a/OsmAnd/res/layout/list_bigtextview.xml
+++ b/OsmAnd/res/layout/list_bigtextview.xml
@@ -1,7 +1,7 @@
 <?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_height="wrap_content">
 
     <TextView
         android:id="@+id/Text"
@@ -11,7 +11,6 @@
         android:layout_marginLeft="20dip"
         android:layout_marginTop="12dip"
         android:gravity="center_vertical"
-        android:textSize="20sp" >
-    </TextView>
+        android:textSize="20sp"></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_item_bidforfix.xml b/OsmAnd/res/layout/list_item_bidforfix.xml
index bdde2dbc7e..aff746d785 100644
--- a/OsmAnd/res/layout/list_item_bidforfix.xml
+++ b/OsmAnd/res/layout/list_item_bidforfix.xml
@@ -3,7 +3,7 @@
     android:id="@+id/bidforfixitemlayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@android:color/white" >
+    android:background="@android:color/white">
 
     <TextView
         android:id="@+id/bffiText"
diff --git a/OsmAnd/res/layout/list_menu_item.xml b/OsmAnd/res/layout/list_menu_item.xml
index 59c76e0f15..0796c9fb0e 100644
--- a/OsmAnd/res/layout/list_menu_item.xml
+++ b/OsmAnd/res/layout/list_menu_item.xml
@@ -7,16 +7,15 @@
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
     android:background="@color/color_white">
-    
+
     <ImageView
-        android:layout_marginLeft="7dip" 
+        android:layout_marginLeft="7dip"
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:gravity="center"
-        android:layout_gravity="center_vertical"
-        />
+        android:layout_gravity="center_vertical" />
 
     <TextView
         android:id="@+id/title"
@@ -24,31 +23,33 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dip"
         android:layout_marginTop="12dip"
-    	android:layout_marginBottom="12dip"
+        android:layout_marginBottom="12dip"
         android:gravity="center_vertical"
         android:text="@string/layer_poi"
         android:textSize="18sp"
-        android:textColor="@color/color_black" android:layout_weight="1"/>
+        android:textColor="@color/color_black"
+        android:layout_weight="1" />
 
-    <LinearLayout android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:gravity="center_vertical">
 
-    <ImageView android:id="@+id/icon_settings"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:gravity="center_vertical"
-               android:visibility="gone"
-               android:focusable="false"/>
+        <ImageView
+            android:id="@+id/icon_settings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:focusable="false" />
 
-    <CheckBox
-        android:id="@+id/check_item"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="2dip"
-        android:button="@drawable/ic_btn_wocheckbox"
-        android:focusable="false"
-         />
+        <CheckBox
+            android:id="@+id/check_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="2dip"
+            android:button="@drawable/ic_btn_wocheckbox"
+            android:focusable="false" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_menu_item_native.xml b/OsmAnd/res/layout/list_menu_item_native.xml
index e4c0daf796..ba3ba5bf85 100644
--- a/OsmAnd/res/layout/list_menu_item_native.xml
+++ b/OsmAnd/res/layout/list_menu_item_native.xml
@@ -6,47 +6,48 @@
     android:orientation="horizontal"
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip">
-    
+
     <ImageView
-        android:layout_marginLeft="7dip" 
+        android:layout_marginLeft="7dip"
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:gravity="center"
-        android:layout_gravity="center_vertical"
-        />
-    
+        android:layout_gravity="center_vertical" />
+
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dip"
         android:layout_marginTop="12dip"
-    	android:layout_marginBottom="12dip"
+        android:layout_marginBottom="12dip"
         android:gravity="center_vertical"
         android:text="@string/layer_poi"
         style="@style/ListText"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
-    <LinearLayout android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:gravity="center_vertical">
 
-        <ImageView android:id="@+id/icon_settings"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:gravity="center_vertical"
-                   android:visibility="gone"
-                   android:focusable="false"/>
+        <ImageView
+            android:id="@+id/icon_settings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:focusable="false" />
 
-<!-- android:button="@drawable/ic_btn_wocheckbox" -->
-    <CheckBox
-        android:id="@+id/check_item"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="2dip"
-        android:focusable="false"/>
+        <!-- android:button="@drawable/ic_btn_wocheckbox" -->
+        <CheckBox
+            android:id="@+id/check_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="2dip"
+            android:focusable="false" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_textview.xml b/OsmAnd/res/layout/list_textview.xml
index fb11d5fd3c..5b8c8fe10e 100644
--- a/OsmAnd/res/layout/list_textview.xml
+++ b/OsmAnd/res/layout/list_textview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content" android:textSize="20sp" android:textStyle="bold">
-</TextView>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="20sp"
+    android:textStyle="bold"></TextView>
diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index ab2daae1d3..61b01dbcd2 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -1,23 +1,28 @@
 <?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="fill_parent" android:orientation="vertical">
- 
-<TextView android:id="@+id/DescriptionText"  android:layout_width="fill_parent" android:layout_height="wrap_content" 
-       android:layout_marginLeft="10dp" android:layout_marginTop="3dp" android:layout_marginBottom="5dp"
-       android:layout_marginRight="10dp" android:text="@string/download_link_and_local_description"/> 
- 
-<ExpandableListView
-    android:id="@android:id/list"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="0dp"
-    android:layout_marginLeft="0dp"
-    android:layout_marginRight="0dp"
-    android:layout_marginTop="0dp"
-    android:layout_weight="1"
-    android:groupIndicator="@android:color/transparent"
-    style="@style/OsmandListView" >
-</ExpandableListView>
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/DescriptionText"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginRight="10dp"
+        android:text="@string/download_link_and_local_description" />
+
+    <ExpandableListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="0dp"
+        android:layout_weight="1"
+        android:groupIndicator="@android:color/transparent"
+        style="@style/OsmandListView"></ExpandableListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 60b04f8445..5c1e9a0248 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,19 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:orientation="vertical"
-	android:layout_height="wrap_content" android:paddingTop="4dp" android:paddingBottom="4dp" android:paddingRight="8dp" android:paddingLeft="8dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:layout_height="wrap_content"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingRight="8dp"
+    android:paddingLeft="8dp">
 
-	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
-			<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
-				android:gravity="center_vertical" android:focusable="false" />
-		</LinearLayout>
-		<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
-			android:layout_weight="1" style="@style/ListText.Small"></TextView>
-		<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" style="@style/ListText.Small"></TextView>
-	</LinearLayout>
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
 
-	<TextView android:id="@+id/local_index_descr" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:maxLines="25" style="@style/ListText.Small"></TextView>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent">
+
+            <CheckBox
+                android:id="@+id/check_local_index"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:focusable="false" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/local_index_name"
+            android:gravity="center_vertical"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            style="@style/ListText.Small"></TextView>
+
+        <TextView
+            android:id="@+id/local_index_size"
+            android:layout_marginLeft="3dp"
+            android:gravity="right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/ListText.Small"></TextView>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/local_index_descr"
+        android:gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="25"
+        style="@style/ListText.Small"></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_openstreetmap.xml b/OsmAnd/res/layout/local_openstreetmap.xml
index ffbf4bfcd4..5284128c31 100644
--- a/OsmAnd/res/layout/local_openstreetmap.xml
+++ b/OsmAnd/res/layout/local_openstreetmap.xml
@@ -1,11 +1,16 @@
 <?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="fill_parent" android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
 
-<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" 
-		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ListView>
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="3dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginRight="3dp"></ListView>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/local_openstreetmap_list_item.xml b/OsmAnd/res/layout/local_openstreetmap_list_item.xml
index 9311406a47..556b1c6952 100644
--- a/OsmAnd/res/layout/local_openstreetmap_list_item.xml
+++ b/OsmAnd/res/layout/local_openstreetmap_list_item.xml
@@ -1,7 +1,15 @@
 <?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="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-	<TextView android:id="@+id/local_openstreetmap_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="0dp"
-		android:layout_weight="1" style="@style/ListText.Small" android:layout_marginLeft="8dp"></TextView>
+    <TextView
+        android:id="@+id/local_openstreetmap_name"
+        android:gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        style="@style/ListText.Small"
+        android:layout_marginLeft="8dp"></TextView>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 6e501ee2aa..fe649dba0e 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -2,21 +2,21 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:clipChildren="false"
         android:keepScreenOn="true"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
-        <ViewStub android:id="@+id/glSurfaceStub"
-           android:inflatedId="@+id/glSurfaceView"
-           android:layout="@layout/gl_surface"
-           android:layout_width="match_parent"
-           android:layout_height="match_parent" />
+        <ViewStub
+            android:id="@+id/glSurfaceStub"
+            android:inflatedId="@+id/glSurfaceView"
+            android:layout="@layout/gl_surface"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
         <net.osmand.plus.views.OsmAndMapSurfaceView
             android:id="@+id/MapView"
diff --git a/OsmAnd/res/layout/map_settings_item.xml b/OsmAnd/res/layout/map_settings_item.xml
index 17b2a553f5..cfed0c0f67 100644
--- a/OsmAnd/res/layout/map_settings_item.xml
+++ b/OsmAnd/res/layout/map_settings_item.xml
@@ -1,47 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content"
-			  android:paddingLeft="8dp"
-			  android:paddingRight="8dp">
-	<ImageButton android:id="@+id/back"
-				 android:focusable="false"
-				 android:layout_width="wrap_content"
-				 android:layout_height="wrap_content"
-				 android:layout_gravity="center_vertical"
-				 android:background="@null"
-				 android:layout_marginRight="10dp"/>
-	<ImageView android:id="@+id/icon"
-			   android:layout_width="wrap_content"
-			   android:layout_height="wrap_content"
-			   android:visibility="gone"
-			   android:layout_gravity="center_vertical"/>
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp">
 
-	<LinearLayout android:orientation="vertical"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"
-				  android:layout_gravity="center_vertical"
-				  android:layout_weight="1"
-				  android:layout_marginBottom="10dp"
-				  android:layout_marginTop="10dp">
-		<TextView android:id="@+id/name"
-				  android:textSize="16sp"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"/>
-		<TextView android:id="@+id/descr"
-				  android:textSize="12sp"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"
-				  android:visibility="gone"/>
-	</LinearLayout>
+    <ImageButton
+        android:id="@+id/back"
+        android:focusable="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:background="@null"
+        android:layout_marginRight="10dp" />
 
-	<CheckBox android:id="@+id/check"
-			  android:focusable="false"
-			  android:layout_gravity="center_vertical"
-			  android:layout_width="wrap_content"
-			  android:layout_height="wrap_content"
-			  android:visibility="gone"/>
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_gravity="center_vertical" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp">
+
+        <TextView
+            android:id="@+id/name"
+            android:textSize="16sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/descr"
+            android:textSize="12sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/check"
+        android:focusable="false"
+        android:layout_gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml
index 2ff8192857..62fe03b004 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -1,81 +1,244 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <net.osmand.access.AccessibleLayout xmlns:android="http://schemas.android.com/apk/res/android"
-class="net.osmand.access.AccessibleLayout"
-android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="@drawable/background">
-	<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
-  		<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal">
-  			<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:background="@drawable/status_bar" 
-  			android:orientation="horizontal"  android:id="@+id/Headliner" android:layout_marginLeft="8dp" android:layout_marginRight="8dp">
-  				<ImageView android:src="@drawable/icon_small" android:layout_marginLeft="4dp" android:layout_marginTop="4dp"
-  				android:layout_height="wrap_content" android:layout_width="wrap_content"/>
-  				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
-  				android:layout_marginLeft="2dp" android:layout_marginTop="3dp" 
-				android:text="@string/app_name" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
-				<TextView android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1"
-				android:layout_marginLeft="12dp" android:layout_marginTop="3dp" android:layout_marginBottom="3dp" android:text="@string/app_version" android:gravity="right"
-				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="13sp"/> 
-				<ImageView android:id="@+id/HelpButton" android:clickable="true" android:layout_marginTop="7dp" android:layout_marginLeft="4dp" 
-  				android:contentDescription="@string/help"
-  				android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/help_icon"
-  				android:focusable="true"/>				  
-				<ImageView android:layout_marginRight="2dp" android:clickable="true" android:id="@+id/CloseButton"
-				android:contentDescription="@string/close"
-				android:layout_marginTop="7dp" android:layout_height="wrap_content" android:layout_width="wrap_content"
-				android:layout_marginLeft="0dp" android:src="@drawable/headliner_close" android:focusable="true"/>		  
-			</LinearLayout>
-		</LinearLayout>
-		<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-	 		<TableRow android:layout_height = "wrap_content" android:layout_marginTop="15dp">
-	 			<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true"
-	 			android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
-	 				<ImageView
-					android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
-					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
-						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
-						android:layout_gravity="center_horizontal|top" android:textSize="18sp" 
-				    		android:text="@string/map_Button" android:typeface="serif" android:textColor="#000000"/>
-					</LinearLayout>	
-	 			</LinearLayout>
-				<LinearLayout android:layout_weight="2" android:layout_height="fill_parent"/>
-				<LinearLayout android:id="@+id/SearchButton" android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true"
-				android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
-					<ImageView
-					android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
-					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
-						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
-						android:layout_gravity="center_horizontal|top" android:textSize="18sp"		
-						android:text="@string/search_button" android:typeface="serif" android:textColor="#000000"/>
-					</LinearLayout>	
-				</LinearLayout>
-			</TableRow>
-			<TableRow android:layout_height = "wrap_content" android:layout_marginTop="15dp">
-				<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true"
-	 			android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
-	 				<ImageView android:id="@+id/FavoritesButtonImage"
-					android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
-					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
-						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/FavoritesButtonText"
-						android:layout_gravity="center_horizontal|top" android:textSize="18sp" 
-						android:text="@string/my_data_Button" android:typeface="serif" android:textColor="#000000"/>
-					</LinearLayout>	
-	 			</LinearLayout>
-				<LinearLayout android:layout_weight="2" android:layout_height="fill_parent"/>
-				<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true"
-				android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
-					<ImageView android:id="@+id/SettingsButtonImage"
-					android:src="@drawable/button_icon_settings" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
-					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
-						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
-						android:layout_gravity="center_horizontal|top" android:textSize="18sp" android:id="@+id/SettingsButtonText"  
-					    	android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"/>
-					</LinearLayout>	
-				</LinearLayout>
-			</TableRow>
-		</TableLayout>
-	</LinearLayout>  
+    class="net.osmand.access.AccessibleLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/background">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal">
+
+            <LinearLayout
+                android:id="@+id/Headliner"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:background="@drawable/status_bar"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginTop="4dp"
+                    android:src="@drawable/icon_small" />
+
+                <TextView
+                    android:id="@+id/AppName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginTop="3dp"
+                    android:text="@string/app_name"
+                    android:textColor="#000000"
+                    android:textSize="20sp"
+                    android:typeface="serif" />
+
+                <TextView
+                    android:id="@+id/TextVersion"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dp"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:text="@string/app_version"
+                    android:textColor="#000000"
+                    android:textSize="13sp"
+                    android:typeface="serif" />
+
+                <ImageView
+                    android:id="@+id/HelpButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginTop="7dp"
+                    android:clickable="true"
+                    android:contentDescription="@string/help"
+                    android:focusable="true"
+                    android:src="@drawable/help_icon" />
+
+                <ImageView
+                    android:id="@+id/CloseButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="0dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_marginTop="7dp"
+                    android:clickable="true"
+                    android:contentDescription="@string/close"
+                    android:focusable="true"
+                    android:src="@drawable/headliner_close" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TableLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+            <TableRow
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp">
+
+                <LinearLayout
+                    android:id="@+id/MapButton"
+                    android:layout_height="175dp"
+                    android:layout_weight="3"
+                    android:background="@drawable/bg_leftr"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:scaleType="center"
+                        android:src="@drawable/button_icon_map" />
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal|top"
+                            android:text="@string/map_Button"
+                            android:textColor="#000000"
+                            android:textSize="18sp"
+                            android:typeface="serif" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_height="fill_parent"
+                    android:layout_weight="2" />
+
+                <LinearLayout
+                    android:id="@+id/SearchButton"
+                    android:layout_height="175dp"
+                    android:layout_weight="3"
+                    android:background="@drawable/bg_rightr"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:scaleType="center"
+                        android:src="@drawable/button_icon_search" />
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal|top"
+                            android:text="@string/search_button"
+                            android:textColor="#000000"
+                            android:textSize="18sp"
+                            android:typeface="serif" />
+                    </LinearLayout>
+                </LinearLayout>
+            </TableRow>
+
+            <TableRow
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp">
+
+                <LinearLayout
+                    android:id="@+id/FavoritesButton"
+                    android:layout_height="175dp"
+                    android:layout_weight="3"
+                    android:background="@drawable/bg_leftr"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/FavoritesButtonImage"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:scaleType="center"
+                        android:src="@drawable/button_icon_favorites" />
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center">
+
+                        <TextView
+                            android:id="@+id/FavoritesButtonText"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal|top"
+                            android:text="@string/my_data_Button"
+                            android:textColor="#000000"
+                            android:textSize="18sp"
+                            android:typeface="serif" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_height="fill_parent"
+                    android:layout_weight="2" />
+
+                <LinearLayout
+                    android:id="@+id/SettingsButton"
+                    android:layout_height="175dp"
+                    android:layout_weight="3"
+                    android:background="@drawable/bg_rightr"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/SettingsButtonImage"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:scaleType="center"
+                        android:src="@drawable/button_icon_settings" />
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center">
+
+                        <TextView
+                            android:id="@+id/SettingsButtonText"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal|top"
+                            android:text="@string/settings_Button"
+                            android:textColor="#000000"
+                            android:textSize="18sp"
+                            android:typeface="serif" />
+                    </LinearLayout>
+                </LinearLayout>
+            </TableRow>
+        </TableLayout>
+    </LinearLayout>
 </net.osmand.access.AccessibleLayout>
diff --git a/OsmAnd/res/layout/mode_toggles.xml b/OsmAnd/res/layout/mode_toggles.xml
index 94983bdf88..4465909510 100644
--- a/OsmAnd/res/layout/mode_toggles.xml
+++ b/OsmAnd/res/layout/mode_toggles.xml
@@ -2,8 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal" android:layout_gravity="center_horizontal" android:gravity="center_horizontal"
+    android:orientation="horizontal"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
     android:paddingTop="7dp"
     android:paddingBottom="7dp">
-    
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/navigate_point.xml b/OsmAnd/res/layout/navigate_point.xml
index 1374e002bc..9d555ba690 100644
--- a/OsmAnd/res/layout/navigate_point.xml
+++ b/OsmAnd/res/layout/navigate_point.xml
@@ -1,29 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus" 
-    android:layout_width="fill_parent" android:layout_height="fill_parent" >
-<LinearLayout
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal">
-<net.osmand.view.ExpandableLinearLayout custom:maxVisibleWidth="800dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" >
-<TextView android:id="@+id/TextView" android:textSize="16sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/navigate_point_top_text"></TextView>
+    xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
-<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:stretchColumns="1">
-<TableRow android:layout_width="fill_parent" >
-<TextView android:textSize="20sp"  android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_latitude"></TextView>
-<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LatitudeEdit" android:layout_marginLeft="5dp"  android:layout_marginRight="5dp" android:inputType="phone"></EditText>
-</TableRow>
-<TableRow android:layout_width="fill_parent" >
-<TextView android:textSize="20sp"  android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_longitude"></TextView>
-<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/LongitudeEdit" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:inputType="phone"></EditText>
-</TableRow>
-<TableRow android:layout_width="fill_parent" >
-<TextView android:textSize="20sp"  android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="@string/navigate_point_format"></TextView>
-<Spinner android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/Format" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" ></Spinner>
-</TableRow>
-<TextView android:id="@+id/ValidateTextView" android:textSize="16sp"  android:visibility="gone"  android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" android:gravity="center" android:textColor="@color/color_invalid"></TextView>
-</TableLayout>
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center_horizontal">
 
-</net.osmand.view.ExpandableLinearLayout>
-</LinearLayout>
+        <net.osmand.view.ExpandableLinearLayout
+            custom:maxVisibleWidth="800dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/TextView"
+                android:textSize="16sp"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
+                android:text="@string/navigate_point_top_text"></TextView>
+
+            <TableLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:stretchColumns="1">
+
+                <TableRow android:layout_width="fill_parent">
+
+                    <TextView
+                        android:textSize="20sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="@string/navigate_point_latitude"></TextView>
+
+                    <EditText
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/LatitudeEdit"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:inputType="phone"></EditText>
+                </TableRow>
+
+                <TableRow android:layout_width="fill_parent">
+
+                    <TextView
+                        android:textSize="20sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="@string/navigate_point_longitude"></TextView>
+
+                    <EditText
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/LongitudeEdit"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:inputType="phone"></EditText>
+                </TableRow>
+
+                <TableRow android:layout_width="fill_parent">
+
+                    <TextView
+                        android:textSize="20sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="@string/navigate_point_format"></TextView>
+
+                    <Spinner
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/Format"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"></Spinner>
+                </TableRow>
+
+                <TextView
+                    android:id="@+id/ValidateTextView"
+                    android:textSize="16sp"
+                    android:visibility="gone"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:gravity="center"
+                    android:textColor="@color/color_invalid"></TextView>
+            </TableLayout>
+
+        </net.osmand.view.ExpandableLinearLayout>
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/notification.xml b/OsmAnd/res/layout/notification.xml
index 7345890252..3a6abe5e3e 100644
--- a/OsmAnd/res/layout/notification.xml
+++ b/OsmAnd/res/layout/notification.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/layout"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical" android:background="@color/color_black">
+    android:id="@+id/layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:background="@color/color_black">
 
-	<net.osmand.access.NotificationTextView android:id="@+id/message"
-		android:layout_marginLeft="4dp" android:layout_marginRight="4dp"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:textSize="18sp" android:gravity="fill_horizontal"/>
+    <net.osmand.access.NotificationTextView
+        android:id="@+id/message"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textSize="18sp"
+        android:gravity="fill_horizontal" />
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/open_bug.xml b/OsmAnd/res/layout/open_bug.xml
index d2af1fb61d..959553adee 100644
--- a/OsmAnd/res/layout/open_bug.xml
+++ b/OsmAnd/res/layout/open_bug.xml
@@ -1,44 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_marginLeft="5dp"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/osb_comment_dialog_message" />
+
+    <EditText
+        android:id="@+id/BugMessage"
+        android:minLines="1"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-    <TextView android:layout_marginLeft="5dp"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:text="@string/osb_comment_dialog_message"/>
-    <EditText android:id="@+id/BugMessage"
-              android:minLines="1"
-              android:layout_marginLeft="5dp"
-              android:layout_marginRight="5dp"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:inputType="textMultiLine"/>
+        android:inputType="textMultiLine" />
 
 
-    <TextView android:layout_marginLeft="5dp"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:text="@string/osb_comment_dialog_author"/>
-    <EditText android:id="@+id/AuthorName"
-              android:layout_marginLeft="5dp"
-              android:layout_marginRight="5dp"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:text="NoName"/>
+    <TextView
+        android:layout_marginLeft="5dp"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/osb_comment_dialog_author" />
+
+    <EditText
+        android:id="@+id/AuthorName"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:text="NoName" />
 
 
-    <TextView android:layout_marginLeft="5dp"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:text="@string/osb_author_dialog_password"/>
-    <EditText android:id="@+id/Password"
-              android:layout_marginLeft="5dp"
-              android:layout_marginRight="5dp"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:inputType="textPassword"/>
+    <TextView
+        android:layout_marginLeft="5dp"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/osb_author_dialog_password" />
+
+    <EditText
+        android:id="@+id/Password"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:inputType="textPassword" />
 
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/open_hours_edit.xml b/OsmAnd/res/layout/open_hours_edit.xml
index 1a598acc9d..3719f4b0a6 100644
--- a/OsmAnd/res/layout/open_hours_edit.xml
+++ b/OsmAnd/res/layout/open_hours_edit.xml
@@ -1,11 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">  -->
-<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android">
-<ListView android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/ListView" />
-<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
-<TimePicker android:id="@+id/TimePickerStart" android:layout_width="wrap_content" android:layout_height="wrap_content"></TimePicker>
-<TimePicker android:layout_marginLeft="5dp" android:id="@+id/TimePickerEnd" android:layout_width="wrap_content" android:layout_height="wrap_content"></TimePicker>
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?><!-- <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">  -->
+<LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/ListView" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp">
+
+        <TimePicker
+            android:id="@+id/TimePickerStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"></TimePicker>
+
+        <TimePicker
+            android:layout_marginLeft="5dp"
+            android:id="@+id/TimePickerEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"></TimePicker>
+    </LinearLayout>
 
 </LinearLayout>
 
diff --git a/OsmAnd/res/layout/open_hours_list_item.xml b/OsmAnd/res/layout/open_hours_list_item.xml
index 1fca33b6cd..f2a52fc64f 100644
--- a/OsmAnd/res/layout/open_hours_list_item.xml
+++ b/OsmAnd/res/layout/open_hours_list_item.xml
@@ -1,14 +1,24 @@
 <?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:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
-	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="0dp"
-		android:layout_height="wrap_content" android:textSize="20sp" />
-		
-	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" 
-		android:contentDescription="@string/default_buttons_delete"
-		android:paddingLeft="2dp" android:paddingRight="2dp"
-		android:paddingTop="2dp" android:layout_height="wrap_content" />
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="20sp" />
+
+    <ImageButton
+        android:id="@+id/remove"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/reset_image"
+        android:contentDescription="@string/default_buttons_delete"
+        android:paddingLeft="2dp"
+        android:paddingRight="2dp"
+        android:paddingTop="2dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_connect_to_device.xml b/OsmAnd/res/layout/osmo_connect_to_device.xml
index a8b1c08ada..341444a152 100644
--- a/OsmAnd/res/layout/osmo_connect_to_device.xml
+++ b/OsmAnd/res/layout/osmo_connect_to_device.xml
@@ -4,14 +4,14 @@
     android:layout_height="wrap_content"
     android:paddingLeft="7dp"
     android:paddingRight="7dp"
-    android:stretchColumns="1" >
+    android:stretchColumns="1">
 
     <TableRow>
 
         <RadioGroup
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_span="2" >
+            android:layout_span="2">
 
             <RadioButton
                 android:id="@+id/ConnectToDevice"
@@ -59,8 +59,10 @@
             android:inputType="textCapWords"
             android:paddingLeft="3dp" />
     </TableRow>
-    
-  <TableRow android:id="@+id/MyGroupName" android:visibility="gone">
+
+    <TableRow
+        android:id="@+id/MyGroupName"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/osmo_create_group.xml b/OsmAnd/res/layout/osmo_create_group.xml
index d4779c71c6..bff452e3f0 100644
--- a/OsmAnd/res/layout/osmo_create_group.xml
+++ b/OsmAnd/res/layout/osmo_create_group.xml
@@ -1,14 +1,14 @@
 <?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_height="fill_parent">
 
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="7dp"
         android:paddingRight="7dp"
-        android:stretchColumns="1" >
+        android:stretchColumns="1">
 
         <TableRow>
 
@@ -67,9 +67,9 @@
                 android:paddingLeft="3dp" />
         </TableRow>
 
-        
+
         <TableRow>
-            
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -81,6 +81,7 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="3dp" />
         </TableRow>
+
         <TableRow>
 
             <TextView
diff --git a/OsmAnd/res/layout/osmo_edit_device.xml b/OsmAnd/res/layout/osmo_edit_device.xml
index 699786ad47..7df448d980 100644
--- a/OsmAnd/res/layout/osmo_edit_device.xml
+++ b/OsmAnd/res/layout/osmo_edit_device.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="7dp"
     android:paddingRight="7dp"
-    android:stretchColumns="1" >
+    android:stretchColumns="1">
 
     <TableRow>
 
@@ -18,8 +18,7 @@
             android:layout_width="180dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:text="" >
+            android:layout_marginRight="5dp">
 
             <requestFocus />
         </EditText>
@@ -27,21 +26,19 @@
 
     <TableRow
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/osmo_edit_color" >
-        </TextView>
+            android:text="@string/osmo_edit_color" />
 
         <Spinner
             android:id="@+id/ColorSpinner"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp" >
-        </Spinner>
+            android:layout_marginRight="5dp" />
     </TableRow>
 
 </TableLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_group_item.xml b/OsmAnd/res/layout/osmo_group_item.xml
index c191f2bbfd..2eb6ad6de3 100644
--- a/OsmAnd/res/layout/osmo_group_item.xml
+++ b/OsmAnd/res/layout/osmo_group_item.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="5dp"
     android:paddingLeft="3dp"
     android:paddingRight="4dp"
-    android:paddingTop="5dp" >
+    android:paddingTop="5dp">
 
     <ImageView
         android:id="@+id/explist_indicator"
@@ -25,16 +25,14 @@
         android:layout_marginLeft="8dp"
         android:layout_marginTop="0dp"
         android:layout_weight="1"
-        android:textSize="18sp" >
-    </TextView>
+        android:textSize="18sp" />
 
     <include layout="@layout/check_item_rel" />
 
-    <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:layout_gravity="center_vertical" >
+        android:layout_gravity="center_vertical">
 
         <ImageView
             android:id="@+id/settings"
diff --git a/OsmAnd/res/layout/osmo_group_list_item.xml b/OsmAnd/res/layout/osmo_group_list_item.xml
index 5745aa1bb5..6f742f31a1 100644
--- a/OsmAnd/res/layout/osmo_group_list_item.xml
+++ b/OsmAnd/res/layout/osmo_group_list_item.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="5dp"
     android:paddingLeft="8dp"
     android:paddingRight="4dp"
-    android:paddingTop="5dp" >
+    android:paddingTop="5dp">
 
     <ImageView
         android:id="@+id/osmo_user_icon"
@@ -18,19 +18,18 @@
     <TextView
         android:id="@+id/osmo_label"
         style="@style/ListText"
-        android:layout_width="0dp" 
+        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_time"
         style="@style/ListText.Small"
-        android:layout_width="wrap_content" 
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="3dp"
-         />
+        android:layout_marginLeft="3dp" />
 
     <!-- <include layout="@layout/check_item" />  -->
 
diff --git a/OsmAnd/res/layout/osmo_groups_list.xml b/OsmAnd/res/layout/osmo_groups_list.xml
index 49e6df1dcb..d176236cb2 100644
--- a/OsmAnd/res/layout/osmo_groups_list.xml
+++ b/OsmAnd/res/layout/osmo_groups_list.xml
@@ -2,10 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
+
+    <include layout="@layout/osmo_groups_list_header" />
 
-	<include layout="@layout/osmo_groups_list_header"/>
     <ExpandableListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
@@ -15,7 +15,6 @@
         android:layout_marginTop="0dp"
         android:layout_weight="1"
         android:groupIndicator="@android:color/transparent"
-        style="@style/OsmandListView">
-    </ExpandableListView>
+        style="@style/OsmandListView" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_groups_list_footer.xml b/OsmAnd/res/layout/osmo_groups_list_footer.xml
index c706f26af3..475fe4f9f0 100644
--- a/OsmAnd/res/layout/osmo_groups_list_footer.xml
+++ b/OsmAnd/res/layout/osmo_groups_list_footer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/osmo_no_connection_msg"
diff --git a/OsmAnd/res/layout/osmo_groups_list_header.xml b/OsmAnd/res/layout/osmo_groups_list_header.xml
index 895e819a9c..ae386cfa46 100644
--- a/OsmAnd/res/layout/osmo_groups_list_header.xml
+++ b/OsmAnd/res/layout/osmo_groups_list_header.xml
@@ -6,12 +6,12 @@
     android:layout_marginLeft="5dp"
     android:layout_marginTop="5dp"
     android:layout_marginRight="5dp"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/osmo_status"
@@ -36,7 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="3dp"
-        android:layout_marginTop="3dp" >
+        android:layout_marginTop="3dp">
 
         <TextView
             android:id="@+id/osmo_user_name_text_view"
@@ -66,7 +66,7 @@
             android:minWidth="0dp"
             android:text="\?"
             android:textAppearance="?android:attr/textAppearance" />
-        
+
     </RelativeLayout>
 
     <CheckBox
diff --git a/OsmAnd/res/layout/package_delivered.xml b/OsmAnd/res/layout/package_delivered.xml
index 2167a32b65..e979d08ed1 100644
--- a/OsmAnd/res/layout/package_delivered.xml
+++ b/OsmAnd/res/layout/package_delivered.xml
@@ -1,45 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="fill_parent"
-			  android:layout_height="match_parent"
-			  android:background="@color/color_black">
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:background="@color/color_black">
 
-	<TextView android:id="@+id/point_name"
-			  android:layout_width="wrap_content"
-			  android:layout_height="wrap_content"
-			  android:layout_gravity="center_horizontal"
-			  android:textSize="16sp"
-			  android:layout_marginTop="2dp"
-			  android:layout_marginBottom="2dp"
-			  android:textStyle="bold"/>
+    <TextView
+        android:id="@+id/point_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textSize="16sp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp"
+        android:textStyle="bold" />
 
-	<TextView android:id="@+id/point_id"
-			  android:layout_width="wrap_content"
-			  android:layout_height="wrap_content"
-			  android:visibility="gone"/>
+    <TextView
+        android:id="@+id/point_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
 
-	<LinearLayout android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"
-				  android:orientation="horizontal">
-		<TextView android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"
-				  android:layout_marginLeft="10dp"
-				  android:layout_marginRight="10dp"
-				  android:text="@string/package_delivered"/>
-		<Button android:id="@+id/delivered_yes"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="5dp"
-				android:layout_marginRight="5dp"
-				android:text="@string/default_buttons_yes"/>
-		<Button android:id="@+id/delivered_no"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="5dp"
-				android:layout_marginRight="5dp"
-				android:text="@string/default_buttons_no"/>
-	</LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/package_delivered" />
+
+        <Button
+            android:id="@+id/delivered_yes"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="@string/default_buttons_yes" />
+
+        <Button
+            android:id="@+id/delivered_no"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="@string/default_buttons_no" />
+    </LinearLayout>
 
 </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 372490bbb7..bc17432004 100644
--- a/OsmAnd/res/layout/parking_set_time_limit.xml
+++ b/OsmAnd/res/layout/parking_set_time_limit.xml
@@ -2,20 +2,20 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
-	<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" >
+        android:layout_gravity="center_horizontal">
 
         <TextView
             android:id="@+id/textView1"
diff --git a/OsmAnd/res/layout/parking_set_type.xml b/OsmAnd/res/layout/parking_set_type.xml
index 2205c48581..fedc4ffc49 100644
--- a/OsmAnd/res/layout/parking_set_type.xml
+++ b/OsmAnd/res/layout/parking_set_type.xml
@@ -2,12 +2,12 @@
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-   android:gravity="center_horizontal" >
+    android:gravity="center_horizontal">
 
     <TableRow
         android:id="@+id/tableRow1"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <ImageButton
             android:id="@+id/parking_no_lim_button"
@@ -31,7 +31,7 @@
     <TableRow
         android:id="@+id/tableRow2"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/parking_lim_text"
diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml
index dc537baffe..570c681f63 100644
--- a/OsmAnd/res/layout/plan_route_info.xml
+++ b/OsmAnd/res/layout/plan_route_info.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
 
     <ScrollView
@@ -10,49 +10,56 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
         android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp" 
+        android:layout_marginTop="5dp"
         android:layout_marginRight="5dp">
 
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:id="@+id/RouteTargets" >
-            <TextView android:id="@+id/ValidateTextView" android:textSize="16sp"  android:visibility="gone"  android:layout_width="fill_parent" android:layout_height="wrap_content" 
-	    		android:text="" android:gravity="center" android:textColor="@color/color_invalid"></TextView>
-            
-  			<TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/map_config_white"
-                    android:drawablePadding="3dp"
-                    android:text="@string/target_points"
-                    android:id="@+id/Targets"
-                    android:textSize="24sp" />
+            android:id="@+id/RouteTargets">
+
+            <TextView
+                android:id="@+id/ValidateTextView"
+                android:textSize="16sp"
+                android:visibility="gone"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:gravity="center"
+                android:textColor="@color/color_invalid"></TextView>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/map_config_white"
+                android:drawablePadding="3dp"
+                android:text="@string/target_points"
+                android:id="@+id/Targets"
+                android:textSize="24sp" />
 
             <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="3dp"
                     android:text="@string/route_from"
-                    android:textSize="18sp" >
-                </TextView>
+                    android:textSize="18sp"></TextView>
 
                 <Spinner
                     android:id="@+id/FromSpinner"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-					android:textSize="18sp" >
-                </Spinner>
+                    android:textSize="18sp"></Spinner>
             </LinearLayout>
-            
-             <LinearLayout android:layout_width="fill_parent"
-                	android:layout_height="wrap_content" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:id="@+id/ViaView"
@@ -62,19 +69,19 @@
                     android:gravity="left"
                     android:textSize="18sp" />
 
-             </LinearLayout>
-            
-             <LinearLayout
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="3dp"
                     android:text="@string/route_to"
-                    android:textSize="18sp" >
-                    
+                    android:textSize="18sp">
+
                 </TextView>
 
                 <Spinner
@@ -82,57 +89,61 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:textSize="18sp" >
-                </Spinner>
+                    android:textSize="18sp"></Spinner>
             </LinearLayout>
-         <View android:layout_width="fill_parent"
-			   android:layout_height="2dip"
-               android:background="#FFC8C8C8" />   
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:background="#FFC8C8C8" />
         </LinearLayout>
-         
+
     </ScrollView>
-    <LinearLayout android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center"
-            android:id="@+id/RouteInfoControls" >
-        <ImageButton 
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:id="@+id/RouteInfoControls">
+
+        <ImageButton
             android:id="@+id/Prev"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="centerInside"
-            android:background="@drawable/map_btn_plain" 
+            android:background="@drawable/map_btn_plain"
             android:contentDescription="@string/previous_button"
-            android:src="@drawable/ax_1_navigation_previous_item_light"
-            />
-        <ImageButton 
+            android:src="@drawable/ax_1_navigation_previous_item_light" />
+
+        <ImageButton
             android:id="@+id/Info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:scaleType="centerInside"
-            android:background="@drawable/map_btn_plain" 
+            android:background="@drawable/map_btn_plain"
             android:contentDescription="@string/info_button"
-            android:src="@drawable/ax_2_action_about_light"
-            />
-        <ImageButton 
+            android:src="@drawable/ax_2_action_about_light" />
+
+        <ImageButton
             android:id="@+id/Next"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:scaleType="centerInside"
-            android:background="@drawable/map_btn_plain" 
+            android:background="@drawable/map_btn_plain"
             android:contentDescription="@string/next_button"
-            android:src="@drawable/ax_1_navigation_next_item_light"
-            />
-        
+            android:src="@drawable/ax_1_navigation_next_item_light" />
+
     </LinearLayout>
-    <Button android:id="@+id/SimulateRoute"
-        	android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_gravity="center_horizontal"
-        	android:drawableLeft="@drawable/ic_action_play_dark"
-        	android:text="@string/animate_route"
-        />
+
+    <Button
+        android:id="@+id/SimulateRoute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="center_horizontal"
+        android:drawableLeft="@drawable/ic_action_play_dark"
+        android:text="@string/animate_route" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_settings.xml b/OsmAnd/res/layout/plan_route_settings.xml
index f25eb3004b..7a8bcaa2cc 100644
--- a/OsmAnd/res/layout/plan_route_settings.xml
+++ b/OsmAnd/res/layout/plan_route_settings.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/TopBar"
@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp" 
+        android:layout_marginTop="5dp"
         android:layout_marginLeft="10dp">
 
         <TextView
@@ -21,8 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:text="@string/gpx_navigation"
-            android:textSize="18sp" >
-        </TextView>
+            android:textSize="18sp"></TextView>
 
         <Spinner
             android:id="@+id/GPXRouteSpinner"
@@ -30,8 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:textSize="18sp" >
-        </Spinner>
+            android:textSize="18sp"></Spinner>
     </LinearLayout>
 
     <ListView
@@ -39,7 +37,6 @@
         style="@style/OsmandListView"
         android:layout_marginTop="5dp"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
-    </ListView>
+        android:layout_height="fill_parent"></ListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plugins.xml b/OsmAnd/res/layout/plugins.xml
index 38c8cc5ea5..36ce93f075 100644
--- a/OsmAnd/res/layout/plugins.xml
+++ b/OsmAnd/res/layout/plugins.xml
@@ -1,11 +1,20 @@
 <?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="fill_parent" android:orientation="vertical">
-  
-<TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_plugin_to_activate"></TextView>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
-<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="0dp"
-		android:layout_marginTop="10dp"></ListView>
+    <TextView
+        android:id="@+id/Label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/select_plugin_to_activate"></TextView>
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_weight="1"
+        android:layout_height="0dp"
+        android:layout_marginTop="10dp"></ListView>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 57b31e2d77..e9ed0a9194 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -2,44 +2,53 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
-        android:background="?attr/expandable_category_color"
-        android:paddingTop="6dp"
-        android:paddingBottom="3dp"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp"
-            >
-        <CheckBox android:id="@+id/check_item" android:focusable="false" android:gravity="top" 
-            		android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"/>
-        </LinearLayout>
-    <TextView
-        android:id="@+id/plugin_name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="top"
-        android:textStyle="bold"
-        android:textColor="?android:textColorPrimary"
-        style="@style/ListText" android:text="@string/extra_settings"
-        android:paddingRight="10dp">
-    </TextView>
-	</LinearLayout>
+        android:background="?attr/expandable_category_color"
+        android:paddingBottom="3dp"
+        android:paddingTop="6dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp">
+
+            <CheckBox
+                android:id="@+id/check_item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:focusable="false"
+                android:gravity="top" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/plugin_name"
+            style="@style/ListText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="top"
+            android:paddingRight="10dp"
+            android:text="@string/extra_settings"
+            android:textColor="?android:textColorPrimary"
+            android:textStyle="bold" />
+    </LinearLayout>
+
     <TextView
         android:id="@+id/plugin_descr"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:maxLines="7"
+        android:paddingBottom="5dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="5dp"
         android:text="@string/osmand_extra_settings_description"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
-        android:paddingRight="10dp"
-        android:paddingLeft="10dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp">
+        android:visibility="gone">
 
     </TextView>
 
diff --git a/OsmAnd/res/layout/print_dialog.xml b/OsmAnd/res/layout/print_dialog.xml
index 20bb1c032b..b76ddb1083 100644
--- a/OsmAnd/res/layout/print_dialog.xml
+++ b/OsmAnd/res/layout/print_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <WebView
         android:id="@+id/printDialogWebview"
diff --git a/OsmAnd/res/layout/quickaction.xml b/OsmAnd/res/layout/quickaction.xml
index 1782a66b20..efb1b12ff1 100644
--- a/OsmAnd/res/layout/quickaction.xml
+++ b/OsmAnd/res/layout/quickaction.xml
@@ -2,20 +2,20 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
-        
-     <FrameLayout
-  		android:layout_marginTop="10dip"
+
+    <FrameLayout
+        android:layout_marginTop="10dip"
         android:id="@+id/header2"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/quickaction_top_frame"/>
-        
-  	<ImageView
+        android:background="@drawable/quickaction_top_frame" />
+
+    <ImageView
         android:id="@+id/arrow_up"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"	
+        android:layout_height="wrap_content"
         android:src="@drawable/quickaction_arrow_up" />
-       
+
     <HorizontalScrollView
         android:id="@+id/scroll"
         android:layout_width="fill_parent"
@@ -31,9 +31,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="4dip"
-            android:paddingBottom="4dip" 
+            android:paddingBottom="4dip"
             android:orientation="horizontal">
-        
+
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -43,9 +43,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/quickaction_slider_grip_right" />
-                
+
         </LinearLayout>
-            
+
     </HorizontalScrollView>
 
     <FrameLayout
@@ -59,7 +59,7 @@
         android:id="@+id/arrow_down"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-    	android:layout_marginTop="-1dip"
+        android:layout_marginTop="-1dip"
         android:layout_below="@id/footer"
         android:src="@drawable/quickaction_arrow_down" />
 
diff --git a/OsmAnd/res/layout/route_info_list_item.xml b/OsmAnd/res/layout/route_info_list_item.xml
index 70a7c17aa9..ea1419e676 100644
--- a/OsmAnd/res/layout/route_info_list_item.xml
+++ b/OsmAnd/res/layout/route_info_list_item.xml
@@ -1,13 +1,13 @@
 <?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_height="wrap_content">
 
     <LinearLayout
         android:layout_width="50dp"
         android:layout_height="wrap_content"
         android:layout_marginRight="5dp"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/cumulative_distance"
@@ -29,7 +29,7 @@
         android:layout_width="50dp"
         android:layout_height="match_parent"
         android:layout_marginLeft="5dp"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/distance"
@@ -47,7 +47,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="" >
-    </TextView>
+        android:text=""></TextView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_point_info.xml b/OsmAnd/res/layout/route_point_info.xml
index 229b525b40..c94414c441 100644
--- a/OsmAnd/res/layout/route_point_info.xml
+++ b/OsmAnd/res/layout/route_point_info.xml
@@ -1,30 +1,32 @@
 <?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">
-    <ImageView android:id="@+id/point_icon"
-               android:layout_width="32dp"
-               android:padding="3dp"
-               android:layout_marginLeft="5dp"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_vertical"/>
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/point_icon"
+        android:layout_width="32dp"
+        android:padding="3dp"
+        android:layout_marginLeft="5dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical" />
 
     <TextView
-            android:id="@+id/name"
-            android:layout_marginLeft="6dp"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="10dp"
-            android:layout_weight="1"/>
+        android:id="@+id/name"
+        android:layout_marginLeft="6dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="10dp"
+        android:layout_weight="1" />
 
     <TextView
-            android:id="@+id/date_or_distance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
-            android:layout_gravity="center_vertical"/>
+        android:id="@+id/date_or_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="5dp"
+        android:layout_gravity="center_vertical" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_steps_main.xml b/OsmAnd/res/layout/route_steps_main.xml
index ab49941f19..6a9094be2b 100644
--- a/OsmAnd/res/layout/route_steps_main.xml
+++ b/OsmAnd/res/layout/route_steps_main.xml
@@ -1,33 +1,39 @@
 <?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="fill_parent"
-              android:orientation="vertical">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
-    <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
-        <TextView android:id="@+id/gpx_name"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginLeft="10dp"
-                  android:ellipsize="end"
-                  android:textSize="20sp"/>
+    <LinearLayout
+        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"
-                  android:layout_marginLeft="5dp"
-                  android:minWidth="16dp"
-                  android:textSize="20sp"/>
+        <TextView
+            android:id="@+id/gpx_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:ellipsize="end"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/points_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:minWidth="16dp"
+            android:textSize="20sp" />
 
     </LinearLayout>
 
 
-    <ListView android:id="@android:id/list"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:choiceMode="singleChoice"
-              style="@style/OsmandListView"/>
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:choiceMode="singleChoice"
+        style="@style/OsmandListView" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/save_directions_dialog.xml b/OsmAnd/res/layout/save_directions_dialog.xml
index ba047aaa3a..adc600c5ce 100644
--- a/OsmAnd/res/layout/save_directions_dialog.xml
+++ b/OsmAnd/res/layout/save_directions_dialog.xml
@@ -1,16 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="fill_parent"  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent" android:orientation="vertical">
-  
-<TextView android:text="@string/file_with_name_already_exist" android:id="@+id/DuplicateFileName" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"
-		  android:visibility="gone"/>
-<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginTop="3dp">
-	<TextView android:text="@string/filename_input" android:layout_marginLeft="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-	<EditText android:id="@+id/FileNameEdit" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
-</LinearLayout>
-<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" 
-	android:gravity="bottom|center" android:layout_marginTop="5dp">
-    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button>
-    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_save" android:id="@+id/Save"></Button>
-</LinearLayout>
+<LinearLayout
+    android:layout_width="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:text="@string/file_with_name_already_exist"
+        android:id="@+id/DuplicateFileName"
+        android:layout_marginLeft="5dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="3dp">
+
+        <TextView
+            android:text="@string/filename_input"
+            android:layout_marginLeft="5dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <EditText
+            android:id="@+id/FileNameEdit"
+            android:layout_marginLeft="5dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal"
+        android:gravity="bottom|center"
+        android:layout_marginTop="5dp">
+
+        <Button
+            android:layout_width="125dp"
+            android:layout_height="wrap_content"
+            android:text="@string/default_buttons_cancel"
+            android:id="@+id/Cancel"></Button>
+
+        <Button
+            android:layout_width="125dp"
+            android:layout_height="wrap_content"
+            android:text="@string/default_buttons_save"
+            android:id="@+id/Save"></Button>
+    </LinearLayout>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 46decbeef8..76fdec98c3 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -2,132 +2,120 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent">
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <net.osmand.view.ExpandableLinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            custom:maxVisibleWidth="800dp" >
+            custom:maxVisibleWidth="800dp">
 
             <TableLayout
                 android:id="@+id/TableLayout"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:stretchColumns="1" >
+                android:stretchColumns="1">
 
                 <TableRow
                     android:id="@+id/TableRow"
-                    android:layout_marginLeft="5dp" >
+                    android:layout_marginLeft="5dp">
 
                     <TextView
                         android:id="@+id/TextView"
-                        android:text="@string/search_address_region" >
-                    </TextView>
+                        android:text="@string/search_address_region" />
 
                     <Button
                         android:id="@+id/CountryButton"
-                        android:text="@string/ChooseCountry" 
-                        android:scrollHorizontally="true" 
-    					android:lines="1"
-    					android:ellipsize="end"
-    					android:layout_width="150dp"
-    					/>
+                        android:layout_width="150dp"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:scrollHorizontally="true"
+                        android:text="@string/ChooseCountry" />
 
                     <ImageButton
                         android:id="@+id/ResetCountry"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
                         android:background="?attr/reset_image"
-                        android:contentDescription="@string/default_buttons_reset" >
-                    </ImageButton>
+                        android:contentDescription="@string/default_buttons_reset" />
                 </TableRow>
 
                 <TableRow
                     android:id="@+id/TableRow"
-                    android:layout_marginLeft="5dp" >
+                    android:layout_marginLeft="5dp">
 
                     <TextView
                         android:id="@+id/TextView"
-                        android:text="@string/search_address_city" >
-                    </TextView>
+                        android:text="@string/search_address_city" />
 
                     <Button
                         android:id="@+id/CityButton"
-                        android:text="@string/choose_city"
-                        android:scrollHorizontally="true" 
-    					android:lines="1"
-    					android:ellipsize="end" 
-    					android:layout_width="150dp"
-                        />
+                        android:layout_width="150dp"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:scrollHorizontally="true"
+                        android:text="@string/choose_city" />
 
                     <ImageButton
                         android:id="@+id/ResetCity"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
                         android:background="?attr/reset_image"
-                        android:contentDescription="@string/default_buttons_reset" >
-                    </ImageButton>
+                        android:contentDescription="@string/default_buttons_reset" />
                 </TableRow>
 
                 <TableRow
                     android:id="@+id/TableRow"
-                    android:layout_marginLeft="5dp" >
+                    android:layout_marginLeft="5dp">
 
                     <TextView
                         android:id="@+id/TextView"
-                        android:text="@string/search_address_street" >
-                    </TextView>
+                        android:text="@string/search_address_street" />
 
                     <Button
                         android:id="@+id/StreetButton"
-                        android:text="@string/choose_street"
-                        android:scrollHorizontally="true" 
-    					android:lines="1"
-    					android:ellipsize="end"
-    					android:layout_width="150dp"
-                         />
+                        android:layout_width="150dp"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:scrollHorizontally="true"
+                        android:text="@string/choose_street" />
 
                     <ImageButton
                         android:id="@+id/ResetStreet"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
                         android:background="?attr/reset_image"
-                        android:contentDescription="@string/default_buttons_reset" >
-                    </ImageButton>
+                        android:contentDescription="@string/default_buttons_reset" />
                 </TableRow>
 
                 <TableRow
                     android:id="@+id/TableRow"
-                    android:layout_marginLeft="5dp" >
+                    android:layout_marginLeft="5dp">
 
                     <TextView
                         android:id="@+id/BuildingText"
-                        android:text="@string/search_address_building" >
-                    </TextView>
+                        android:text="@string/search_address_building" />
 
                     <Button
                         android:id="@+id/BuildingButton"
-                        android:text="@string/choose_building"
-                        android:scrollHorizontally="true" 
-    					android:lines="1"
-    					android:ellipsize="end"
-    					android:layout_width="150dp"
-    					 />
+                        android:layout_width="150dp"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:scrollHorizontally="true"
+                        android:text="@string/choose_building" />
 
                     <ImageButton
                         android:id="@+id/ResetBuilding"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
                         android:background="?attr/reset_image"
-                        android:contentDescription="@string/default_buttons_reset" >
-                    </ImageButton>
+                        android:contentDescription="@string/default_buttons_reset" />
                 </TableRow>
             </TableLayout>
 
@@ -137,22 +125,20 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:layout_span="3"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <RadioButton
                     android:id="@+id/RadioBuilding"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/search_address_building_option" >
-                </RadioButton>
+                    android:text="@string/search_address_building_option" />
 
                 <RadioButton
                     android:id="@+id/RadioIntersStreet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
-                    android:text="@string/search_address_street_option" >
-                </RadioButton>
+                    android:text="@string/search_address_street_option" />
             </RadioGroup>
         </net.osmand.view.ExpandableLinearLayout>
     </LinearLayout>
diff --git a/OsmAnd/res/layout/search_address_offline.xml b/OsmAnd/res/layout/search_address_offline.xml
index ac5e732bc5..04697204fa 100644
--- a/OsmAnd/res/layout/search_address_offline.xml
+++ b/OsmAnd/res/layout/search_address_offline.xml
@@ -2,14 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ListView
         android:id="@android:id/list"
         style="@style/OsmandListView"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" >
-    </ListView>
+        android:layout_weight="1"></ListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address_offline_list_item.xml b/OsmAnd/res/layout/search_address_offline_list_item.xml
index 692b32550c..c5a536481b 100644
--- a/OsmAnd/res/layout/search_address_offline_list_item.xml
+++ b/OsmAnd/res/layout/search_address_offline_list_item.xml
@@ -1,11 +1,20 @@
 <?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="fill_parent" android:orientation="horizontal">
-	<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
-		android:layout_width="80dp" android:layout_height="wrap_content" android:gravity="left"
-		android:textSize="20sp"/>
-	<TextView android:id="@+id/label" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:textSize="20sp" />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/distance_label"
+        android:layout_marginLeft="5dp"
+        android:layout_width="80dp"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp" />
 </LinearLayout>
diff --git a/OsmAnd/res/layout/search_address_online.xml b/OsmAnd/res/layout/search_address_online.xml
index e267e580fc..5f4f01397e 100644
--- a/OsmAnd/res/layout/search_address_online.xml
+++ b/OsmAnd/res/layout/search_address_online.xml
@@ -2,21 +2,20 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/LinearLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginRight="5dp"
-        android:layout_marginTop="5dp" >
-        
+        android:layout_marginTop="5dp">
+
         <ProgressBar
             android:id="@+id/ProgressBar"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" 
-            android:visibility="invisible">
-        </ProgressBar>
+            android:layout_height="wrap_content"
+            android:visibility="invisible"></ProgressBar>
 
         <EditText
             android:id="@+id/SearchText"
@@ -24,16 +23,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:hint="@string/hint_search_online"
-            android:text="" >
-        </EditText>
+            android:text=""></EditText>
 
         <Button
             android:id="@+id/SearchButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="80dp"
-            android:text="@string/search_button" >
-        </Button>
+            android:text="@string/search_button"></Button>
     </LinearLayout>
 
     <ListView
@@ -41,7 +38,6 @@
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        style="@style/OsmandListView">
-    </ListView>
+        style="@style/OsmandListView"></ListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address_online_list_item.xml b/OsmAnd/res/layout/search_address_online_list_item.xml
index d5a29bb999..26eb651487 100644
--- a/OsmAnd/res/layout/search_address_online_list_item.xml
+++ b/OsmAnd/res/layout/search_address_online_list_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/distance_label"
@@ -16,6 +16,6 @@
         android:id="@+id/label"
         style="@style/ListText.Small"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_by_name.xml b/OsmAnd/res/layout/search_by_name.xml
index cc3b7e9ef4..63694fdaad 100644
--- a/OsmAnd/res/layout/search_by_name.xml
+++ b/OsmAnd/res/layout/search_by_name.xml
@@ -1,25 +1,51 @@
 <?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="fill_parent" android:orientation="vertical">
-  <!-- 
-<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="3dp" android:layout_marginRight="5dp"
-    android:orientation="horizontal">
-<TextView android:text="" android:id="@+id/Label" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center"></TextView>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+    <!--
+  <LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="3dp" android:layout_marginRight="5dp"
+      android:orientation="horizontal">
+  <TextView android:text="" android:id="@+id/Label" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center"></TextView>
+  </LinearLayout>
+   -->
 
-</LinearLayout>
- -->
+    <LinearLayout
+        android:id="@+id/LinearLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginTop="1dp">
 
-<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="1dp" android:layout_marginRight="3dp">
-<ProgressBar android:id="@+id/ProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content"></ProgressBar>
-<EditText android:text="" android:id="@+id/SearchText" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:inputType="textFilter"></EditText>
-<Button android:id="@+id/ResetButton" android:layout_width="wrap_content" android:layout_height="wrap_content" 
-			android:layout_weight="0" android:text="@string/default_buttons_reset"></Button>
+        <ProgressBar
+            android:id="@+id/ProgressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-</LinearLayout>
+        <EditText
+            android:id="@+id/SearchText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:inputType="number" />
 
-<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" 
-		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" style="@style/OsmandListView"></ListView>
+        <Button
+            android:id="@+id/ResetButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/default_buttons_reset" />
 
-</LinearLayout>
+    </LinearLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        style="@style/OsmandListView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginTop="3dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 2c22789476..0644c3fe95 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/label"
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="3dp"
         android:layout_marginRight="3dp"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
     <ImageButton
         android:id="@+id/remove"
diff --git a/OsmAnd/res/layout/search_main.xml b/OsmAnd/res/layout/search_main.xml
index 0ff7a5b976..59b814f93b 100644
--- a/OsmAnd/res/layout/search_main.xml
+++ b/OsmAnd/res/layout/search_main.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TabHost
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/tabhost"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -14,35 +14,35 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"/>
-        
+            android:layout_weight="0" />
+
         <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="vertical"
-	        android:background="@drawable/ic_background_topofsearchactivities">
-       		<TextView
-				android:id="@+id/textViewADesc"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:background="@drawable/ic_background_tabinfotext"
-				android:textColor="@color/color_white"
-				android:text="@string/poi_search_desc"
-				android:textAppearance="?android:attr/textAppearanceSmall"/>
-		</LinearLayout>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/ic_background_topofsearchactivities">
+
+            <TextView
+                android:id="@+id/textViewADesc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/ic_background_tabinfotext"
+                android:textColor="@color/color_white"
+                android:text="@string/poi_search_desc"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
 
         <FrameLayout
             android:id="@android:id/tabcontent"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            />
+            android:layout_height="0dp" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:layout_weight="1" />
 
     </LinearLayout>
 </TabHost>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_main_tab_header.xml b/OsmAnd/res/layout/search_main_tab_header.xml
index ec886291a6..c98ab1aaf8 100644
--- a/OsmAnd/res/layout/search_main_tab_header.xml
+++ b/OsmAnd/res/layout/search_main_tab_header.xml
@@ -2,5 +2,4 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:id="@+id/TabImage"
-    />
+    android:id="@+id/TabImage" />
diff --git a/OsmAnd/res/layout/search_transport.xml b/OsmAnd/res/layout/search_transport.xml
index 3ac0d8a76d..f72cf32be7 100644
--- a/OsmAnd/res/layout/search_transport.xml
+++ b/OsmAnd/res/layout/search_transport.xml
@@ -1,28 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file is at /res/layout/list.xml -->
+<?xml version="1.0" encoding="utf-8"?><!-- This file is at /res/layout/list.xml -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/RootLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <ProgressBar
             android:id="@+id/ProgressBar"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-        </ProgressBar>
+            android:layout_height="wrap_content" />
 
         <Button
             android:id="@+id/SearchTransportLevelButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1" >
-        </Button>
+            android:layout_weight="1" />
 
         <TextView
             android:id="@+id/SearchAreaText"
@@ -35,7 +32,7 @@
         android:id="@+id/RelativeLayout"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_gravity="center" >
+        android:layout_gravity="center">
 
         <ListView
             android:id="@android:id/list"
@@ -43,16 +40,14 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_below="@+id/listView"
-            style="@style/OsmandListView">
-        </ListView>
+            style="@style/OsmandListView" />
 
         <ListView
             android:id="@+id/listView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true" 
-            style="@style/OsmandListView" >
-        </ListView>
+            android:layout_alignParentTop="true"
+            style="@style/OsmandListView" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_transport_list_item.xml b/OsmAnd/res/layout/search_transport_list_item.xml
index 3a2324dede..cf8df22051 100644
--- a/OsmAnd/res/layout/search_transport_list_item.xml
+++ b/OsmAnd/res/layout/search_transport_list_item.xml
@@ -1,13 +1,21 @@
 <?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:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
-	<ImageView android:id="@+id/search_icon" android:layout_width="25dp"
-		android:paddingLeft="2dp" android:paddingRight="2dp"
-		android:paddingTop="2dp" android:layout_height="fill_parent" />
-	
-	<TextView android:id="@+id/label" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" style="@style/ListText.Small"/>
+    <ImageView
+        android:id="@+id/search_icon"
+        android:layout_width="25dp"
+        android:layout_height="fill_parent"
+        android:paddingLeft="2dp"
+        android:paddingRight="2dp"
+        android:paddingTop="2dp" />
+
+    <TextView
+        android:id="@+id/label"
+        style="@style/ListText.Small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_transport_route_item.xml b/OsmAnd/res/layout/search_transport_route_item.xml
index fee1c31308..6d6004cb57 100644
--- a/OsmAnd/res/layout/search_transport_route_item.xml
+++ b/OsmAnd/res/layout/search_transport_route_item.xml
@@ -1,17 +1,27 @@
 <?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:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
-<!-- 	<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
-		android:layout_width="80dp" android:layout_height="fill_parent" android:gravity="left"
-		android:textSize="20sp"/>  -->
-	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="0dp"
-		android:layout_height="wrap_content" style="@style/ListText" />
-		
-	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" 
-		android:contentDescription="@string/default_buttons_delete"
-		android:paddingLeft="2dp" android:paddingRight="2dp"
-		android:paddingTop="2dp" android:layout_height="wrap_content" />
+    <!-- 	<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
+            android:layout_width="80dp" android:layout_height="fill_parent" android:gravity="left"
+            android:textSize="20sp"/>  -->
+    <TextView
+        android:id="@+id/label"
+        style="@style/ListText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <ImageButton
+        android:id="@+id/remove"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/reset_image"
+        android:contentDescription="@string/default_buttons_delete"
+        android:paddingLeft="2dp"
+        android:paddingRight="2dp"
+        android:paddingTop="2dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchbyname_list.xml b/OsmAnd/res/layout/searchbyname_list.xml
index 69b7677411..27472aa85d 100644
--- a/OsmAnd/res/layout/searchbyname_list.xml
+++ b/OsmAnd/res/layout/searchbyname_list.xml
@@ -1,9 +1,14 @@
 <?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:paddingTop="3dp"
-	android:paddingBottom="3dp"
-	android:orientation="horizontal">
-	<TextView android:id="@+id/NameLabel" android:layout_width="fill_parent"
-		android:layout_height="fill_parent" style="@style/ListText"/>
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="3dp"
+    android:paddingTop="3dp">
+
+    <TextView
+        android:id="@+id/NameLabel"
+        style="@style/ListText"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
 </LinearLayout>
diff --git a/OsmAnd/res/layout/searchpoi.xml b/OsmAnd/res/layout/searchpoi.xml
index 0f61b978f4..fbf521e2c9 100644
--- a/OsmAnd/res/layout/searchpoi.xml
+++ b/OsmAnd/res/layout/searchpoi.xml
@@ -1,14 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-	<!-- This file is at /res/layout/list.xml -->
+<?xml version="1.0" encoding="utf-8"?>    <!-- This file is at /res/layout/list.xml -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/SearchFilterLayout" android:visibility="gone"
-	    android:layout_marginLeft = "5dp" >
-		<TextView android:layout_width="wrap_content" android:text="@string/search_poi_filter" android:id="@+id/TextView" android:layout_height="wrap_content"/>
-		<EditText android:layout_marginLeft = "5dp"  android:layout_marginRight = "5dp" android:layout_width="fill_parent" android:text="" android:id="@+id/SearchFilter" android:layout_height="wrap_content"/>
-	</LinearLayout>
-	<ListView android:id="@android:id/list" android:layout_width="fill_parent" 
-		android:layout_height="fill_parent" style="@style/OsmandListView"></ListView>
-	
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/SearchFilterLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/TextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/search_poi_filter" />
+
+        <EditText
+            android:id="@+id/SearchFilter"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@android:id/list"
+        style="@style/OsmandListView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoi_list.xml b/OsmAnd/res/layout/searchpoi_list.xml
index 68f956bfc7..9dd44d3f2e 100644
--- a/OsmAnd/res/layout/searchpoi_list.xml
+++ b/OsmAnd/res/layout/searchpoi_list.xml
@@ -1,31 +1,42 @@
 <?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:paddingTop="5dp"
-	android:paddingBottom="5dp"
-	>
-	
-    <LinearLayout android:layout_width="wrap_content"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dp"
+    android:paddingTop="5dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:orientation="horizontal"
         android:paddingLeft="6dp"
         android:paddingRight="3dp">
 
-        <ImageView android:id="@+id/poi_direction" android:layout_width="26dp" android:layout_height="26dp"
-			/>
-        
-        <ImageView android:id="@+id/poi_icon" android:layout_width="26dp" android:layout_height="26dp"
-			android:layout_marginLeft="3dp" />
-        
+        <ImageView
+            android:id="@+id/poi_direction"
+            android:layout_width="26dp"
+            android:layout_height="26dp" />
+
+        <ImageView
+            android:id="@+id/poi_icon"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
+            android:layout_marginLeft="3dp" />
+
     </LinearLayout>
 
-	<LinearLayout android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:paddingRight="3dp">
-	
-		<TextView android:id="@+id/poi_label" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:gravity="center_vertical" style="@style/ListText.Small"/>
-	
-	</LinearLayout>
-	
+
+        <TextView
+            android:id="@+id/poi_label"
+            style="@style/ListText.Small"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical" />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoifolder_list.xml b/OsmAnd/res/layout/searchpoifolder_list.xml
index d6169b4204..dc8f8d16ab 100644
--- a/OsmAnd/res/layout/searchpoifolder_list.xml
+++ b/OsmAnd/res/layout/searchpoifolder_list.xml
@@ -1,18 +1,32 @@
 <?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:paddingTop="5dp"
-	android:paddingBottom="5dp"
-	android:orientation="horizontal">
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="5dp"
+    android:paddingTop="5dp">
 
-	<ImageView android:id="@+id/folder_icon" android:layout_width="37dip"
-		android:paddingLeft="8dp" android:paddingRight="8dp"
-		android:paddingTop="2dp" android:layout_height="fill_parent" />
-	<TextView android:id="@+id/folder_label" android:layout_width="0dp" android:layout_weight="1"
-		android:layout_height="wrap_content" style="@style/ListText"/>
-	
-	<ImageView android:id="@+id/folder_edit_icon"
-		android:paddingLeft="4dp" android:paddingRight="8dp" android:src="@android:drawable/ic_input_get"
-		android:layout_width="37dip"
-		android:paddingTop="2dp" android:layout_height="fill_parent" />
+    <ImageView
+        android:id="@+id/folder_icon"
+        android:layout_width="37dip"
+        android:layout_height="fill_parent"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:paddingTop="2dp" />
+
+    <TextView
+        android:id="@+id/folder_label"
+        style="@style/ListText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <ImageView
+        android:id="@+id/folder_edit_icon"
+        android:layout_width="37dip"
+        android:layout_height="fill_parent"
+        android:paddingLeft="4dp"
+        android:paddingRight="8dp"
+        android:paddingTop="2dp"
+        android:src="@android:drawable/ic_input_get" />
 </LinearLayout>
diff --git a/OsmAnd/res/layout/selected_track_edit.xml b/OsmAnd/res/layout/selected_track_edit.xml
index 046941d040..d40aa29f22 100644
--- a/OsmAnd/res/layout/selected_track_edit.xml
+++ b/OsmAnd/res/layout/selected_track_edit.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="7dp"
     android:paddingRight="7dp"
-    android:stretchColumns="1" >
+    android:stretchColumns="1">
 
     <TableRow>
 
@@ -18,27 +18,24 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            />
+            android:layout_marginRight="5dp" />
     </TableRow>
 
     <TableRow
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/gpx_split_interval" >
-        </TextView>
+            android:text="@string/gpx_split_interval"></TextView>
 
         <Spinner
             android:id="@+id/Spinner"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp" >
-        </Spinner>
+            android:layout_marginRight="5dp"></Spinner>
     </TableRow>
 
 </TableLayout>
diff --git a/OsmAnd/res/layout/send_gpx_osm.xml b/OsmAnd/res/layout/send_gpx_osm.xml
index 36b7c7eab8..3dbfb20d3f 100644
--- a/OsmAnd/res/layout/send_gpx_osm.xml
+++ b/OsmAnd/res/layout/send_gpx_osm.xml
@@ -1,29 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent" android:stretchColumns="1">
-   <TextView android:id="@+id/DescriptionTextTop"  android:layout_marginLeft="5dp" android:layout_marginBottom="5dp"
-            style="@style/ListText" android:gravity="center_horizontal"
-  			android:layout_height="wrap_content" android:text="@string/send_files_to_osm"></TextView>
-  <TableRow android:layout_width="fill_parent">
-  <TextView android:id="@+id/TextView"  android:layout_marginLeft="5dp"
-  			android:layout_height="wrap_content" android:text="@string/gpx_description_txt"></TextView>
-  <EditText android:text="" android:id="@+id/DescriptionText" android:minLines="3" android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
-  			android:layout_height="wrap_content" android:layout_width="fill_parent"></EditText>
-  </TableRow>
-  <TableRow android:layout_width="fill_parent">
-  <TextView android:id="@+id/TextView" android:layout_marginLeft="5dp"
-  			android:layout_height="wrap_content" android:text="@string/gpx_tags_txt"></TextView>
-  <EditText android:id="@+id/TagsText" android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
-  			android:layout_height="wrap_content"  android:text="osmand" android:layout_width="fill_parent"></EditText>
-  </TableRow>
-  <TableRow android:layout_width="fill_parent">
-  <TextView android:id="@+id/TextView" android:layout_marginLeft="5dp"
-  			android:layout_height="wrap_content" android:text="@string/gpx_visibility_txt"></TextView>
-  <Spinner android:id="@+id/Visibility" android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
-  			android:layout_height="wrap_content"  android:layout_width="fill_parent"></Spinner>
-  </TableRow>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:stretchColumns="1">
+
+    <TextView
+        android:id="@+id/DescriptionTextTop"
+        style="@style/ListText"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="5dp"
+        android:gravity="center_horizontal"
+        android:text="@string/send_files_to_osm" />
+
+    <TableRow android:layout_width="fill_parent">
+
+        <TextView
+            android:id="@+id/TextView"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="@string/gpx_description_txt" />
+
+        <EditText
+            android:id="@+id/DescriptionText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:minLines="3"
+            android:text="" />
+    </TableRow>
+
+    <TableRow android:layout_width="fill_parent">
+
+        <TextView
+            android:id="@+id/TextView"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="@string/gpx_tags_txt" />
+
+        <EditText
+            android:id="@+id/TagsText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:text="osmand" />
+    </TableRow>
+
+    <TableRow android:layout_width="fill_parent">
+
+        <TextView
+            android:id="@+id/TextView"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="@string/gpx_visibility_txt" />
+
+        <Spinner
+            android:id="@+id/Visibility"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp" />
+    </TableRow>
 
 
 </TableLayout>
diff --git a/OsmAnd/res/layout/sherpafy_browse_tour.xml b/OsmAnd/res/layout/sherpafy_browse_tour.xml
index 7b0090974d..a367fa0947 100644
--- a/OsmAnd/res/layout/sherpafy_browse_tour.xml
+++ b/OsmAnd/res/layout/sherpafy_browse_tour.xml
@@ -1,5 +1,4 @@
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,12 +8,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
     <!-- The navigation drawer -->
-    <ListView android:id="@+id/left_drawer"
+    <ListView
+        android:id="@+id/left_drawer"
         android:layout_width="240dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:choiceMode="singleChoice"
         android:divider="@drawable/divider"
         android:dividerHeight="1px"
-        android:background="@color/color_white"/>
+        android:background="@color/color_white" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/sherpafy_drawer_list_item.xml b/OsmAnd/res/layout/sherpafy_drawer_list_item.xml
index b2b84112df..5f3db49b2b 100644
--- a/OsmAnd/res/layout/sherpafy_drawer_list_item.xml
+++ b/OsmAnd/res/layout/sherpafy_drawer_list_item.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:paddingBottom="8dp"
-    android:paddingTop="8dp" >
+    android:paddingTop="8dp">
 
     <ImageView
         android:id="@+id/Icon"
diff --git a/OsmAnd/res/layout/sherpafy_list_tour_item.xml b/OsmAnd/res/layout/sherpafy_list_tour_item.xml
index 91ef2786f3..4bca5493b3 100644
--- a/OsmAnd/res/layout/sherpafy_list_tour_item.xml
+++ b/OsmAnd/res/layout/sherpafy_list_tour_item.xml
@@ -1,79 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 android:layout_width="fill_parent"
-			 android:layout_height="wrap_content"
-			 android:background="@drawable/sherpafy_tour_row">
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/sherpafy_tour_row">
 
-	<LinearLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="15dp"
-			android:layout_marginLeft="14dp"
-			android:layout_marginRight="14dp"
-			android:layout_marginTop="15dp"
-			android:id="@+id/AreaPreview"
-			android:background="@drawable/tour_bg"
-			android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:layout_marginLeft="14dp"
+        android:layout_marginRight="14dp"
+        android:layout_marginTop="15dp"
+        android:id="@+id/AreaPreview"
+        android:background="@drawable/tour_bg"
+        android:orientation="vertical">
 
-		<FrameLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-			
-			<ImageView
-					android:layout_marginLeft="1dp"
-					android:layout_marginRight="1dp"
-					android:layout_marginTop="1dp"
-					android:id="@+id/TourImage"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:scaleType="centerCrop">
-			</ImageView>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-			<TextView
-					android:id="@+id/TourName"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_gravity="bottom"
-					android:layout_marginLeft="10dp"
-					android:layout_marginRight="6dp"
-					android:background="@color/shadow_color"
-					android:ellipsize="end"
-					android:maxLines="1"
-					android:textColor="@color/color_white"
-					android:textSize="23sp"/>
-		</FrameLayout>
+            <ImageView
+                android:layout_marginLeft="1dp"
+                android:layout_marginRight="1dp"
+                android:layout_marginTop="1dp"
+                android:id="@+id/TourImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"></ImageView>
 
-		<TextView
-				android:id="@+id/TourDescription"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="10dp"
-				android:layout_marginRight="5dp"
-				android:layout_marginTop="5dp"
-				android:layout_weight="1"
-				android:ellipsize="end"
-				android:maxLines="3"
-				android:textSize="16sp"/>
+            <TextView
+                android:id="@+id/TourName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="6dp"
+                android:background="@color/shadow_color"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="@color/color_white"
+                android:textSize="23sp" />
+        </FrameLayout>
 
-		<LinearLayout
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="14dp"
-				android:layout_marginRight="14dp"
-				android:layout_marginTop="5dp"
-				android:layout_marginBottom="3dp"
-				android:orientation="vertical">
+        <TextView
+            android:id="@+id/TourDescription"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="3"
+            android:textSize="16sp" />
 
-			<TextView
-					android:id="@+id/MoreInformation"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:textSize="14sp"
-					android:focusable="false"
-					/>
-		</LinearLayout>
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="14dp"
+            android:layout_marginRight="14dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="3dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/MoreInformation"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:focusable="false" />
+        </LinearLayout>
 
 
-	</LinearLayout>
+    </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/sherpafy_loading.xml b/OsmAnd/res/layout/sherpafy_loading.xml
index 965fe8f724..4f4723c51b 100644
--- a/OsmAnd/res/layout/sherpafy_loading.xml
+++ b/OsmAnd/res/layout/sherpafy_loading.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent">
 
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:gravity="center_vertical|center_horizontal"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <ProgressBar
             android:id="@+id/ProgressBar"
diff --git a/OsmAnd/res/layout/sherpafy_stage_info.xml b/OsmAnd/res/layout/sherpafy_stage_info.xml
index 77d8d8ce3b..b5ca6a4f5a 100644
--- a/OsmAnd/res/layout/sherpafy_stage_info.xml
+++ b/OsmAnd/res/layout/sherpafy_stage_info.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -12,15 +11,15 @@
         android:visibility="gone" />
 
     <ScrollView
-        
+
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="fill_parent">
 
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="@color/color_white"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/Icon"
@@ -34,7 +33,7 @@
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
                 android:layout_marginTop="5dp"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/HeaderText"
diff --git a/OsmAnd/res/layout/sherpafy_stage_list_item.xml b/OsmAnd/res/layout/sherpafy_stage_list_item.xml
index c6fd46e575..9b51cfa931 100644
--- a/OsmAnd/res/layout/sherpafy_stage_list_item.xml
+++ b/OsmAnd/res/layout/sherpafy_stage_list_item.xml
@@ -4,22 +4,24 @@
     android:layout_height="wrap_content"
     android:paddingBottom="8dp"
     android:paddingTop="8dp"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
-    <FrameLayout 
+    <FrameLayout
         android:layout_width="48dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp" >
-    	<ImageView
-        	android:id="@+id/Icon"
-        	android:layout_width="48dp"
-        	android:layout_height="48dp"/>
-	</FrameLayout>
+        android:layout_marginRight="8dp">
+
+        <ImageView
+            android:id="@+id/Icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp" />
+    </FrameLayout>
+
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1" 
+        android:layout_weight="1"
         android:orientation="vertical">
 
         <TextView
diff --git a/OsmAnd/res/layout/stdlist.xml b/OsmAnd/res/layout/stdlist.xml
index 4e702afe20..61696f9af9 100644
--- a/OsmAnd/res/layout/stdlist.xml
+++ b/OsmAnd/res/layout/stdlist.xml
@@ -2,13 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        style="@style/OsmandListView">
-    </ListView>
+        style="@style/OsmandListView"></ListView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/tab_content.xml b/OsmAnd/res/layout/tab_content.xml
index 7812a9efac..55549c7832 100644
--- a/OsmAnd/res/layout/tab_content.xml
+++ b/OsmAnd/res/layout/tab_content.xml
@@ -1,118 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TabHost
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/tabhost"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-		<LinearLayout
-				android:id="@+id/ProgressView"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:visibility="gone" >
+        <LinearLayout
+            android:id="@+id/ProgressView"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone">
 
-			<RelativeLayout
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="3dp"
-					android:layout_marginRight="5dp"
-					android:gravity="center_vertical|left"
-					android:orientation="horizontal" >
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="5dp"
+                android:gravity="center_vertical|left"
+                android:orientation="horizontal">
 
-				<ProgressBar
-						android:id="@+id/IndeterminateProgressBar"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_alignParentTop="true"
-						android:indeterminate="true"
-						android:indeterminateOnly="true"
-						android:visibility="gone" />
+                <ProgressBar
+                    android:id="@+id/IndeterminateProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:indeterminate="true"
+                    android:indeterminateOnly="true"
+                    android:visibility="gone" />
 
-				<TextView
-						android:id="@+id/ProgressPercent"
-						android:layout_width="48dp"
-						android:layout_alignParentRight="true"
-						android:layout_height="wrap_content"
-						android:layout_centerVertical="true"
-						android:gravity="right|center_vertical"
-						android:text=""
-						android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/ProgressPercent"
+                    android:layout_width="48dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="right|center_vertical"
+                    android:text=""
+                    android:textSize="14sp" />
 
-				<TextView
-						android:id="@+id/ProgressMessage"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_centerVertical="true"
-						android:layout_marginLeft="3dp"
-						android:layout_toLeftOf="@id/ProgressPercent"
-						android:layout_toRightOf="@id/IndeterminateProgressBar"
-						android:ellipsize="end"
-						android:gravity="left|center_vertical"
-						android:singleLine="true"
-						android:text=""
-						android:textSize="14sp" />
-			</RelativeLayout>
+                <TextView
+                    android:id="@+id/ProgressMessage"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="3dp"
+                    android:layout_toLeftOf="@id/ProgressPercent"
+                    android:layout_toRightOf="@id/IndeterminateProgressBar"
+                    android:ellipsize="end"
+                    android:gravity="left|center_vertical"
+                    android:singleLine="true"
+                    android:text=""
+                    android:textSize="14sp" />
+            </RelativeLayout>
 
-			<LinearLayout
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="5dp"
-					android:layout_marginRight="5dp"
-					android:gravity="center_vertical"
-					android:orientation="horizontal" >
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-				<ProgressBar
-						android:id="@+id/DeterminateProgressBar"
-						style="?android:attr/progressBarStyleHorizontal"
-						android:layout_width="0dp"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
+                <ProgressBar
+                    android:id="@+id/DeterminateProgressBar"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
 
-				<ImageView
-						android:id="@+id/Cancel"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:src="@drawable/a_1_navigation_cancel_small_dark" />
-			</LinearLayout>
-		</LinearLayout>
+                <ImageView
+                    android:id="@+id/Cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/a_1_navigation_cancel_small_dark" />
+            </LinearLayout>
+        </LinearLayout>
 
-		<TabWidget
+        <TabWidget
             android:id="@android:id/tabs"
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"/>
+            android:layout_weight="0" />
 
 
-
-		<FrameLayout
+        <FrameLayout
             android:id="@android:id/tabcontent"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            />
+            android:layout_height="0dp" />
 
         <net.osmand.plus.CustomPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:layout_weight="1" />
 
-		<Button
-				android:id="@+id/DownloadButton"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="bottom"
-				android:layout_marginLeft="3dp"
-				android:layout_marginRight="3dp"
-				android:layout_marginTop="3dp"
-				android:gravity="center"
-				android:text="@string/download_files"
-				android:visibility="gone" />
+        <Button
+            android:id="@+id/DownloadButton"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="3dp"
+            android:layout_marginRight="3dp"
+            android:layout_marginTop="3dp"
+            android:gravity="center"
+            android:text="@string/download_files"
+            android:visibility="gone" />
 
     </LinearLayout>
 
diff --git a/OsmAnd/res/layout/tips_and_tricks.xml b/OsmAnd/res/layout/tips_and_tricks.xml
index 4bd78b65d5..79406ae754 100644
--- a/OsmAnd/res/layout/tips_and_tricks.xml
+++ b/OsmAnd/res/layout/tips_and_tricks.xml
@@ -1,19 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="fill_parent" android:orientation="vertical" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
-	<net.osmand.access.ExplorableTextView android:text="" android:id="@+id/TipDescription" android:layout_marginLeft="4dp" android:scrollbars="vertical"
-		android:layout_width="fill_parent" android:layout_height="0dp" android:layout_marginRight="4dp" android:layout_weight="1"
-		style="@style/ListText" android:gravity="fill_horizontal"
-		/>
+    <net.osmand.access.ExplorableTextView
+        android:id="@+id/TipDescription"
+        style="@style/ListText"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_weight="1"
+        android:gravity="fill_horizontal"
+        android:scrollbars="vertical"
+        android:text="" />
 
-<!-- 	<TextView android:text="@string/poi_dialog_other_tags_message" android:id="@+id/TextView" android:layout_marginLeft="5dp"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />  -->
-	<LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="wrap_content"  
-	       android:layout_marginTop = "15dp" android:orientation="horizontal" android:gravity="bottom|center">
-		<Button android:minWidth="70dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/previous_button" android:id="@+id/PreviousButton"></Button>
-		<Button android:minWidth="70dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/next_button" android:id="@+id/NextButton"></Button>
-		<Button android:minWidth="70dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" android:id="@+id/CloseButton"></Button>
-		
-	</LinearLayout>
-</LinearLayout>
+    <!-- 	<TextView android:text="@string/poi_dialog_other_tags_message" android:id="@+id/TextView" android:layout_marginLeft="5dp"
+            android:layout_width="fill_parent" android:layout_height="wrap_content" />  -->
+    <LinearLayout
+        android:id="@+id/LinearLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:gravity="bottom|center"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/PreviousButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="70dp"
+            android:text="@string/previous_button" />
+
+        <Button
+            android:id="@+id/NextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="70dp"
+            android:text="@string/next_button" />
+
+        <Button
+            android:id="@+id/CloseButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="70dp"
+            android:text="@string/close" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/update_index_list_item.xml b/OsmAnd/res/layout/update_index_list_item.xml
index 6d7ad49bcf..219cf37151 100644
--- a/OsmAnd/res/layout/update_index_list_item.xml
+++ b/OsmAnd/res/layout/update_index_list_item.xml
@@ -1,31 +1,34 @@
 <?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:paddingTop="1dp"
-			  android:paddingBottom="1dp"
-			  android:paddingRight="8dp">
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="1dp"
+    android:paddingBottom="1dp"
+    android:paddingRight="8dp">
 
-	<CheckBox android:id="@+id/check_download_item"
-			  android:layout_width="wrap_content"
-			  android:layout_height="match_parent"
-			  android:gravity="center_vertical"
-			  android:focusable="false"/>
+    <CheckBox
+        android:id="@+id/check_download_item"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:focusable="false" />
 
-	<TextView android:layout_width="0dp"
-			  android:layout_height="match_parent"
-			  android:id="@+id/download_item"
-			  android:gravity="center_vertical"
-			  android:maxLines="7"
-			  android:layout_weight="1"
-			  style="@style/ListText.Small"/>
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:id="@+id/download_item"
+        android:gravity="center_vertical"
+        android:maxLines="7"
+        android:layout_weight="1"
+        style="@style/ListText.Small" />
 
-	<TextView android:layout_width="wrap_content"
-			  android:layout_height="match_parent"
-			  android:id="@+id/download_descr"
-			  android:layout_marginLeft="3dp"
-			  android:gravity="right|center_vertical"
-			  style="@style/ListText.Small"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:id="@+id/download_descr"
+        android:layout_marginLeft="3dp"
+        android:gravity="right|center_vertical"
+        style="@style/ListText.Small" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_header.xml b/OsmAnd/res/layout/waypoint_header.xml
index 322da1c2df..7e333477bf 100644
--- a/OsmAnd/res/layout/waypoint_header.xml
+++ b/OsmAnd/res/layout/waypoint_header.xml
@@ -1,37 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="fill_parent"
-			  android:layout_height="match_parent"
-			  android:layout_marginTop="5dp"
-			  android:layout_marginBottom="5dp"
-			  android:minHeight="40dp"
-			  android:layout_marginRight="3dp">
-	<ProgressBar
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:id="@+id/ProgressBar"
-			android:layout_marginLeft="4dp"/>
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
+    android:minHeight="40dp"
+    android:layout_marginRight="3dp">
 
-	<TextView android:id="@+id/header_text"
-			  android:layout_width="0dp"
-			  android:layout_height="wrap_content"
-			  android:layout_marginLeft="8dp"
-			  android:singleLine="true"
-			  android:ellipsize="end"
-			  android:layout_gravity="center_vertical"
-			  android:layout_weight="1"
-			  android:textSize="20sp"/>
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/ProgressBar"
+        android:layout_marginLeft="4dp" />
 
-	<include layout="@layout/check_item_rel"/>
-	<ImageView
-			android:id="@+id/sort"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:layout_marginTop="8dp"
-			android:layout_marginBottom="8dp"
-			android:layout_marginRight="8dp"/>
+    <TextView
+        android:id="@+id/header_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:textSize="20sp" />
+
+    <include layout="@layout/check_item_rel" />
+
+    <ImageView
+        android:id="@+id/sort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginRight="8dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_reached.xml b/OsmAnd/res/layout/waypoint_reached.xml
index 78545c36d5..5206990fce 100644
--- a/OsmAnd/res/layout/waypoint_reached.xml
+++ b/OsmAnd/res/layout/waypoint_reached.xml
@@ -1,60 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="fill_parent"
-              android:layout_height="match_parent"
-              android:background="@drawable/view_transparent_selection"
-              android:id="@+id/package_delivered_layout"
-              android:minHeight="48dp"
-              android:descendantFocusability="blocksDescendants" >
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/view_transparent_selection"
+    android:id="@+id/package_delivered_layout"
+    android:minHeight="48dp"
+    android:descendantFocusability="blocksDescendants">
 
-    <ImageView android:id="@+id/waypoint_icon"
-               android:layout_marginLeft="8dp"
-               android:src="@drawable/list_favorite"
-               android:layout_height="25dp"
-               android:layout_width="25dp"
-               android:layout_gravity="center_vertical"/>
-    
-    <TextView android:id="@+id/waypoint_dist"
-              android:layout_width="60dp"
-              android:layout_height="wrap_content"
-              android:layout_marginLeft="4dp"
-              android:layout_gravity="center_vertical"
-              android:textColor="@color/distance_color"
-              android:maxLines="2"
-              android:textStyle="bold"
-              android:textSize="15sp"></TextView>
+    <ImageView
+        android:id="@+id/waypoint_icon"
+        android:layout_marginLeft="8dp"
+        android:src="@drawable/list_favorite"
+        android:layout_height="25dp"
+        android:layout_width="25dp"
+        android:layout_gravity="center_vertical" />
 
-    <TextView android:id="@+id/waypoint_text"
-              android:layout_width="0dp"
-              android:layout_height="wrap_content"
-              android:layout_marginLeft="4dp"
-              android:maxLines="2"
-              android:ellipsize="end"
-              android:layout_gravity="center_vertical"
-              android:layout_weight="1"
-              android:textSize="18sp"/>
+    <TextView
+        android:id="@+id/waypoint_dist"
+        android:layout_width="60dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="4dp"
+        android:layout_gravity="center_vertical"
+        android:textColor="@color/distance_color"
+        android:maxLines="2"
+        android:textStyle="bold"
+        android:textSize="15sp"></TextView>
 
-    <ImageButton android:id="@+id/all_points"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:contentDescription="@string/more"
-                 android:layout_gravity="center_vertical"
-                 android:visibility="gone"
-                 android:focusable="false"
-                 style="@style/Widget.Sherlock.ActionButton"
-                 android:src="@drawable/ic_action_core_overflow_dark"/>
+    <TextView
+        android:id="@+id/waypoint_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="4dp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:textSize="18sp" />
 
-    <ImageButton android:id="@+id/info_close"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:contentDescription="@string/close"
-                 android:layout_gravity="center_vertical"
-                 android:layout_marginRight="4dp"
-                 style="@style/Widget.Sherlock.ActionButton"
-                 android:focusable="false"
-                 android:src="@drawable/ic_action_gremove_dark"/>
+    <ImageButton
+        android:id="@+id/all_points"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/more"
+        android:layout_gravity="center_vertical"
+        android:visibility="gone"
+        android:focusable="false"
+        style="@style/Widget.Sherlock.ActionButton"
+        android:src="@drawable/ic_action_core_overflow_dark" />
+
+    <ImageButton
+        android:id="@+id/info_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/close"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="4dp"
+        style="@style/Widget.Sherlock.ActionButton"
+        android:focusable="false"
+        android:src="@drawable/ic_action_gremove_dark" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_title.xml b/OsmAnd/res/layout/waypoint_title.xml
index 8049485e42..762bfe0849 100644
--- a/OsmAnd/res/layout/waypoint_title.xml
+++ b/OsmAnd/res/layout/waypoint_title.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="fill_parent"
-			  android:layout_height="match_parent"
-			  android:layout_marginTop="5dp"
-			  android:layout_marginBottom="5dp"
-			  android:layout_marginRight="3dp"
-			  android:descendantFocusability="blocksDescendants" >
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
+    android:layout_marginRight="3dp"
+    android:descendantFocusability="blocksDescendants">
+
     <ImageView
         android:id="@+id/back"
         android:layout_width="wrap_content"
@@ -15,41 +16,43 @@
         android:layout_marginBottom="8dp"
         android:layout_marginTop="8dp"
         android:layout_gravity="center_vertical"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
-	<TextView android:id="@+id/title"
-			  android:layout_width="0dp"
-			  android:layout_height="wrap_content"
-			  android:layout_marginLeft="8dp"
-			  android:singleLine="true"
-			  android:layout_gravity="center_vertical"
-			  android:text="@string/waypoints"
-			  android:ellipsize="end"
-			  android:layout_weight="1"
-			  android:layout_marginRight="8dp"
-			  android:textSize="20sp"/>
-	<ImageButton
-			android:id="@+id/sort"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:layout_marginBottom="8dp"
-			android:layout_marginRight="8dp"/>
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:singleLine="true"
+        android:layout_gravity="center_vertical"
+        android:text="@string/waypoints"
+        android:ellipsize="end"
+        android:layout_weight="1"
+        android:layout_marginRight="8dp"
+        android:textSize="20sp" />
 
-	<ImageButton
-			android:id="@+id/edit"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:layout_marginBottom="8dp"
-			android:layout_marginRight="8dp"/>
-	
-	<ImageButton
-			android:id="@+id/all"
-			android:contentDescription="@string/flat_list_waypoints"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:layout_marginBottom="8dp"
-			android:layout_marginRight="8dp"/>
+    <ImageButton
+        android:id="@+id/sort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginRight="8dp" />
+
+    <ImageButton
+        android:id="@+id/edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginRight="8dp" />
+
+    <ImageButton
+        android:id="@+id/all"
+        android:contentDescription="@string/flat_list_waypoints"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginRight="8dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index c61a946f02..117fc310e9 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -845,9 +845,8 @@ OsmAnd е с отворен код и активно да се развива. 
 		\n\t* \'По посоката на движение\' - Картата ще се завърта в зависимост от вашата посока на движение.
 		\n\t* \'По компаса\' - Картата ще бъде ориентирана по вградения компас.
 	</string>
-	<string name="binary_map_download_success">Успешно сваляне
-		\n\t\n\tЗа използване \'Меню\' -&gt; \'Настройки на екрана\' -&gt; \'Карти…\' -&gt; \'Offline vector maps\'.
-	</string>
+	<string name="binary_map_download_success">"Успешно сваляне
+\n\t\n\tЗа да използвате активирайте \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Offline векторни карти\'. "</string>
 	<string name="tip_day_night_mode">Дневен/нощен режим</string>
 	<string name="tip_day_night_mode_t_v2">Можете да променяте изгледа на картата от дневен (ярък) към нощен (тъмен). Тъмният изглед е подходящ за безопасно шофиране нощем.
 		\n\nПревключването между дневен и нощен изглед можете да направите в \'Меню\' -&gt; \'Настройки на екрана…\' -&gt;\'Дневен/нощен изглед\'.
@@ -1018,7 +1017,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="gpx_option_reverse_route">Обръщане посоката на GPX</string>
 	<string name="gpx_option_destination_point">Ползвай текущата крайна цел</string>
 	<string name="gpx_option_from_start_point">Преминахте по целия маршрут</string>
-	<string name="switch_to_vector_map_to_see">За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' -&gt; \'Настройки изглед\' -&gt; \'Карти…\' -&gt; \'Офлайн векторни карти\'.</string>
+	<string name="switch_to_vector_map_to_see">За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Офлайн векторни карти\'.</string>
 	<string name="choose_audio_stream">Канал за гласовите напътствия</string>
 	<string name="choose_audio_stream_descr">Избор на звуков канал за гласовите напътствия (зависи от настройките на Вашето устройство)</string>
 	<string name="voice_stream_voice_call">Канал за гласови данни (за предпочитане)</string>
@@ -1652,7 +1651,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="routing_attr_weight_description">Изберете максималната разрешена маса (тегло) на МПС</string>
     <string name="copying_osmand_files">Копиране файловете на OsmAnd</string>
     <string name="app_mode_truck">Камион</string>
-    <string name="rendering_attr_publicTransportMode_name">Автобусни и тролейбусни линии</string>
+    <string name="rendering_attr_publicTransportMode_name">Автобусни, тролейбусни, маршрутни линии</string>
 	<string name="record_plugin_name">Запис на Вашето пътуване</string>
     <string name="int_hour">ч.</string>
     <string name="duration">Продължителност</string>
@@ -1759,10 +1758,10 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="map_widget_left">Ляв панел</string>
     <string name="layers_category_show">Покажи</string>
 	<string name="configure_map">Настройка на картата</string>
-    <string name="rendering_attr_tramTrainRoutes_name">Трамваи и влакове</string>
+    <string name="rendering_attr_tramTrainRoutes_name">Трамвайни и влакови маршрути</string>
 	<string name="lock_screen_request_explanation">%1$s изисква това разрешение за да изключи екрана с цел пестене на енергия.</string>
     <string name="wake_on_voice">Включи екрана</string>
-    <string name="wake_on_voice_descr">Включи екрана, когато приближава завой</string>
+    <string name="wake_on_voice_descr">Включване на екрана на телефона, когато наближава завой</string>
     <string name="wake_on_voice_never">Никога</string>
     <string name="select_impassable_road">Избери на картата</string>
     <string name="impassable_road">Избягване на пътища…</string>
@@ -1771,4 +1770,9 @@ OsmAnd е с отворен код и активно да се развива. 
     <string name="rendering_attr_busRoutes_name">Автобусни линии</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Маршрути на влакове</string>
     <string name="rendering_attr_trolleybusRoutes_name">Тролейбусни линии</string>
+    <string name="tip_recent_changes_1_9_t">"Промени в версия 1.9: * Актуализирани карти със показване на пътната настилка, транспортни слоеве и туристически символи * Търсене POI по маршрута * Маркиране на пътя като непроходим за сесията * По лесно изтегляне и актуализиране на карти *  Получаване на визуално и аудио уведомление при приближаване до точката * Показване на маршрута и информация към него *  Поддръжка на пътни платна * Поддръжка на Android Wear * Много промени в потребителския интерфейс * Отделна настройка за големината на текста на картата * Специални аудио уведомления в случай че сте напуснали пътя * OsMo вход * Фикс в несъвместимоста на OsMo версията "</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Сподели пътя с такси</string>
+    <string name="search_radius_proximity">В близост до</string>
+    <string name="osmo_device_not_found">Устройството не е намерено</string>
+    <string name="osmo_no_connection_msg">OsMo услугата е недостъпна:\n- проверете връзката;\n- проверете настройките;\n- намерете ни в Twitter: https://twitter.com/OsMomobi</string>
     </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 9cfa7b5965..1d93086acc 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1268,7 +1268,7 @@
 	<string name="bg_service_screen_lock_toast">Bildschirm gesperrt</string>
 	<string name="bg_service_interval">Aufwachintervall setzen:</string>
 	<string name="map_widget_day_night">Tag/Nacht-Modus</string>
-	<string name="map_widget_vector_attributes">Karten-Zusatzoptionen:</string>
+	<string name="map_widget_vector_attributes">Karten-Zusatzoptionen</string>
 	<string name="map_widget_renderer">Kartendarstellung</string>
 
 	<string name="layer_map_appearance">Anzeige konfigurieren</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 9836de5b8b..7dfdb12676 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1683,4 +1683,12 @@
 	<string name="map_widget_left">Αριστερός πίνακας</string>
     <string name="layers_category_show">Εμφάνιση</string>
 	<string name="configure_map">Διαμόρφωση χάρτη</string>
-    </resources>
+    <string name="rendering_attr_tramTrainRoutes_name">Δρομολόγια τραμ και τρένων</string>
+	<string name="rendering_attr_trainLightrailRoutes_name">Δρομολόγια τρένου</string>
+    <string name="rendering_attr_tramRoutes_name">Δρομολόγια τραμ</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Δρομολόγια τρόλεϋ</string>
+    <string name="rendering_attr_busRoutes_name">Δρομολόγια λεωφορείων</string>
+    <string name="rendering_category_transport">Μεταφορές</string>
+    <string name="map_widget_top">Γραμμή κατάστασης</string>
+	<string name="speed_limit_exceed">Ανοχή ορίου ταχύτητας</string>
+	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index eb596c57d3..e4b08f886f 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -66,7 +66,7 @@
   
   <string name="switch_to_raster_map_to_see">Nessuna mappa vettoriale è presente per questa posizione. Ne puoi scaricare una in Impostazioni (Gestisci i file mappe), o passa alle mappe online (abilita il plugin delle mappe online).</string>
   <string name="binary_map_download_success">"Download completato.
-\n\t\n\tPer usarle attivare \'Impostazioni\' → \'Configurazione delle mappe\' → \'Sorgenti mappe...\'\t\'Mappe vettoriali offline\'. "</string>
+\n\t\n\tPer usarle attivare \'Impostazioni\' → \'Gestisci i file delle mappe\' → \'Sorgenti mappe...\' → \'Mappe vettoriali offline\'. "</string>
   <string name="tip_day_night_mode">Modo giorno/notte</string>
   
   <string name="tip_osm_improve">Migliora i dati OSM</string>
@@ -231,7 +231,7 @@
   <string name="gpx_option_reverse_route">Inverti direzione GPX</string>
   <string name="gpx_option_destination_point">Usa il punto di destinazione attuale</string>
   <string name="gpx_option_from_start_point">Percorri tutta la traccia</string>
-  <string name="switch_to_vector_map_to_see">Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\'→\'Strati mappa\'→\'Fonte Mappa…\'→\'Mappe vettoriali offline\'.</string>
+  <string name="switch_to_vector_map_to_see">Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\' → \'Configura la mappa\' → \'Sorgente mappa…\' → \'Mappe vettoriali offline\'.</string>
   <string name="choose_audio_stream">Canale d\'uscita della voce guida</string>
   <string name="choose_audio_stream_descr">Scegli il canale per la guida vocale (dipendente dal sistema)</string>
   <string name="voice_stream_voice_call">Audio chiamate vocali</string>
@@ -269,7 +269,7 @@
 		\n\nScegli poi un modo per condividere la tua posizione. Le opzioni sono: E-Mail, SMS o semplicemente copia le coordinate sugli appunti.
 	</string>
   <string name="tip_favorites">Punti Preferiti</string>
-  <string name="tip_favorites_t">"I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nNel menu contestuale per ogni punto \'Utilizza posizione\' scegliere \'Aggiungi ai favoriti\' e quindi immettere un nome per esso.\n\nDopo il salvataggio, il punto preferito sarà accessibile nel \'Menu\'→\'I miei luoghi\'. Premendo su una qualsiasi voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, attiva nella schermata della mappa il livello \'Preferiti\' dal menù \'Strati mappa\'. "</string>
+  <string name="tip_favorites_t">"I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nPer qualsiasi punto, nel menu contestuale \'Utilizza la posizione…\' scegliere \'Aggiungi ai Preferiti\' e quindi immettere un nome.\n\nDopo il salvataggio, il punto sarà accessibile attraverso \'Menu\' → \'I miei luoghi\'. Premendo su una voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, nella schermata della mappa attiva il livello \'Preferiti\' da \'Menu\' → \'Configura la mappa\'. "</string>
   <string name="create_poi_link_to_osm_doc">  <u>OSM Online</u> con immagini</string>
   <string name="error_doing_search">Errore nella ricerca offline</string>
   <string name="search_offline_geo_error">Impossibile leggere geo intent \'%s\'</string>
@@ -1586,11 +1586,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="about_settings_descr">Informazioni versione, licenze, membri del progetto</string>
     <string name="tips_and_tricks">Aiuto</string>
     <string name="tip_map_styles">Stili mappa</string>
-	<string name="tip_map_styles_t">"OsmAnd supporta la visualizzazione delle mappe vettoriali in differenti stili mappa per adattarsi alle tue esigenze:
-\n\nDiversi stili mappa da quello bilanciato preimpostato, li trovi sotto \'Menu\' -&gt; \'Configura mappa\' -&gt; \'Stile Mappa\' scegli per esempio
-\n\t* Lo stile \'Touring view\': contiene le più dettagliate informazioni possibile per viaggiare e per visitare, incluse le ottimizzazioni per i guidatori professionali (strade contrasto maggiormente distinguibile), opzione per l\'escursionismo Alpino (scala SAC), itinerari ciclistici, simboli per escursionismo, etc.
-\n\t* \'Alto contrasto strade \' mostra le strade con una luminosità dei colori molto accentuata per le situazioni di cattiva illuminazione
-\n\t* \'Inverno e sci\' crea una vista del paesaggio invernale (coperto da neve), e visione globale delle piste da sci e degli impianti di risalita (in abbinata con \'World ski\' download mappa) "</string>
+	<string name="tip_map_styles_t">"OsmAnd supporta le mappe vettoriali offline con stili di visualizzazione differenti per adattarsi alle tue esigenze:
+\n\nOltre allo stile bilanciato preimpostato, sotto \'Menu\' → \'Configura la mappa\' → \'Stile della mappa\' puoi scegliere ad esempio
+\n\t* Lo stile \'Touring view\', che contiene le informazioni più dettagliate possibili per viaggiatori e turisti, incluse le ottimizzazioni per gli autisti professionisti (maggiore contrasto, strade distinguibili), opzioni per l\'escursionismo Alpino (scala SAC), itinerari ciclistici, simboli per escursionismo, ecc.\n\t* \'High contrast roads\' mostra le strade con colori molto accentuati per le situazioni con intensa luminosità ambientale
+\n\t* \'Winter and ski\' crea una vista da paesaggio invernale (coperto da neve) e mostra pendenze sciistiche e impianti di risalita (abbinata alle mappe scaricabili \'World ski\') "</string>
     <string name="base_world_map">Mappa mondiale di base</string>
 	
     
diff --git a/OsmAnd/res/values-ku/strings.xml b/OsmAnd/res/values-ku/strings.xml
index 93376ca7d8..692bae9021 100644
--- a/OsmAnd/res/values-ku/strings.xml
+++ b/OsmAnd/res/values-ku/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>    
-	<string name="dist_control_start">دەستپێکه</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>    
+	<string name="dist_control_start">donya hich wafay bom niya, zhyan hich khoshi bom niya, mrdn jegay shanaziya</string>
     <string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string>
     <string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string>
     <string name="recording_context_menu_show">پشاندە</string>
@@ -8,4 +9,4 @@
     <string name="av_def_action_video">ڤیدیۆ تۆمارکه</string>
     <string name="av_def_action_audio">دەنگ تۆمارکه</string>
     <string name="recording_camera_not_available">کامێرا له به رده ست نيه</string>
-    </resources>
\ No newline at end of file
+    </resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 33081a48e0..8b16e412b8 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -42,8 +42,8 @@
 	<string name="auto_zoom_map">Auto-zoom kart</string>
 	<string name="snap_to_road_descr">Hold posisjon på veien under navigering</string>
 	<string name="snap_to_road">Hold på vei</string>
-	<string name="osmand_short_description_80_chars">OsmAnd er et navigeringsprogram for offline og online kart og som er åpen kildekode</string>
-	<string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbasert OSM-kart</string>
+	<string name="osmand_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
+	<string name="osmand_plus_short_description_80_chars">Global mobilkartvisning &amp; navigering for offline og nettbaserte OSM-kart</string>
 	<string name="recalculate_route_to_your_location">Transportmodus:</string>
 	<string name="select_navigation_mode">Velg transportmåte</string>
 	<string name="day_night_info_description">Soloppgang: %1$s \nSolnedgang: %2$s</string>
@@ -88,7 +88,7 @@
 	<string name="show_traffic_warnings">Vis trafikkvarsler</string>
 	<string name="avoid_toll_roads">Unngå bomveier</string>
 	<string name="continue_follow_previous_route_auto">Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)</string>
-	<string name="route_updated_loc_found">Ruten blir beregnet på nytt når sted blir funnet</string>
+	<string name="route_updated_loc_found">Rute blir beregnet når posisjon blir funnet</string>
 	<string name="osmand_parking_hours">Timer</string>
 	<string name="osmand_parking_minutes">Minutter</string>
 	<string name="osmand_parking_position_description_add_time">Bilen ble parkert her:</string>
@@ -110,22 +110,22 @@
 	<string name="download_link_and_local_description">Klikk her for å laste ned eller oppdatere offline-data. \nKlikk eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):</string>
 	<string name="unknown_from_location">Startpunkt er ennå ikke bestemt</string>
 	<string name="unknown_location">Posisjon ennå ikke kjent</string>
-	<string name="local_indexes_cat_tile">Nettbaserte kart og kartfliser</string>
+	<string name="local_indexes_cat_tile">Nettbaserte- og flis-kart</string>
 	<string name="local_indexes_cat_map">Offline-kart (vektor)</string>
 	
 	<string name="index_settings_descr">Last ned og håndter offline-kart lagret på enheten</string>
 	<string name="map_online_plugin_is_not_installed">Aktiver programtillegg for nettbaserte kart for å velge ulike kartkilder</string>
-	<string name="map_online_data">Nettbaserte kart (fliser)</string>
-	<string name="map_online_data_descr">Bruk nettbaserte kart (laste ned og mellomlagre fliser på SD-kort)</string>
+	<string name="map_online_data">Nettbaserte- og flis-kart</string>
+	<string name="map_online_data_descr">Bruk nettbaserte kart (last ned og bufre fliser på SD-kort)</string>
 	<string name="online_map_settings">Nettbaserte kart</string>
 	<string name="online_map_settings_descr">Still inn nettbaserte eller hurtigbufrede flis-kartkilder</string>
 	<string name="map_settings">Kartinnstillinger</string>
 	<string name="map_settings_descr">Still inn kartvisningen</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vektorkart vises trolig raskere. Fungerer kanskje ikke bra på enkelte enheter.</string>
-	<string name="native_rendering">Rask opptegning</string>
+	<string name="native_rendering">Intern opptegning</string>
 	<string name="show_ruler_level">Vis målestokk</string>
 	<string name="info_button">Info</string>
-	<string name="back_to_location">Tilbake til sted</string>
+	<string name="back_to_location">Tilbake til posisjon</string>
 	<string name="help">Hjelp</string>
 	<string name="show_details">Vis detaljer</string>
 	<string name="accessibility_extensions_descr">Tilgjengelighetsmoduler for gamle Android-versjoner</string>
@@ -204,7 +204,7 @@
 	<string name="index_name_asia">Asia</string>
 	<string name="index_name_oceania">Oseania</string>
 	<string name="index_name_other">Verdens- og emnekart</string>
-	<string name="index_name_wiki">Verdensomspennende Wikipedia</string>
+	<string name="index_name_wiki">Verdensomspennende Wikipedia-interessepunkter</string>
 	<string name="index_name_voice">Talepakker (opptak, begrenset funksjonalitet)</string>
 	<string name="index_name_tts_voice">Talepakker (TTS kunstig tale, foretrekk)</string>
 	<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
@@ -221,12 +221,11 @@
 	<string name="general_settings_descr">Still inn visning og generelle programinnstillinger</string>
 	<string name="global_app_settings">Globale programinnstillinger</string>
 	<string name="tip_rotation_switching">Kartorientering</string>
-	<string name="tip_rotation_switching_t_v2">\tDu kan velge hvordan kartvisningen roteres ved å gjentatte ganger klikke på kompassikonet.
-		\n\tValgene er:
-		\n\t\'Ingen rotasjon (nord er opp)\' - Kart vil ikke roteres. Nord vil alltid være opp
-		\n\t\'I bevegelsesretning\' - Kartorienteringen justeres kontinuerlig til bevegelsesretningen
-		\n\t\'Ifølge kompass\' - Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten
-	</string>
+	<string name="tip_rotation_switching_t_v2">"Du kan slå av/på om og hvordan kartvisningen roteres ved å gjentatte ganger klikke på kartskjermens kompassikon.
+\n\nValgene er:
+\n\t* \'Ingen rotasjon (nord er opp)\': Kart vil ikke roteres. Nord vil alltid være opp
+\n\t* \'I bevegelsesretning\': Kartorienteringen justeres kontinuerlig til bevegelsesretningen
+\n\t* \'Ifølge kompass\': Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten "</string>
 	<string name="binary_map_download_success">"Nedlasting vellykket.
 \n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'. "</string>
 	<string name="tip_day_night_mode">Dag/natt-modus</string>
@@ -253,12 +252,12 @@
 	<string name="file_with_name_already_exists">Fil med dette navnet finnes allerede.</string>
 	<string name="gpx_navigation">GPX-rute</string>
 	<string name="poi_query_by_name_matches_categories">Flere interessepunktkategorier funnet som samsvarer med søket:</string>
-	<string name="data_to_search_poi_not_available">Lokale data til å søke interessepunkter er ikke til stede.</string>
+	<string name="data_to_search_poi_not_available">Lokale data til å søke interessepunkter foreligger ikke.</string>
 	<string name="poi_filter_by_name">Søk på navn</string>
 	<string name="old_poi_file_should_be_deleted">Interessepunktfilen \'%1$s\' er overflødig og kan slettes.</string>
 	<string name="update_poi_file_not_found">Lokal fil for å opprettholde interessepunktendringer ikke funnet og kunne ikke opprettes.</string>
 	<string name="button_upgrade_osmandplus">Oppgrader OsmAnd+</string>
-	<string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din nåværende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string>
+	<string name="map_version_changed_info">Server inneholder kartfiler som ikke er kompatible med din gjeldende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.</string>
 	<string name="local_index_mi_rename">Endre navn</string>
 	<string name="show_gpx_route">Vis på kart</string>
 	<string name="search_position_current_location_search">Søker posisjon…</string>
@@ -276,7 +275,7 @@
 	<string name="filename_input">Filnavn: </string>
 	<string name="file_with_name_already_exist">Fil med samme navn finnes allerede.</string>
 	<string name="default_buttons_save">Lagre</string>
-	<string name="menu_save_directions">Lagre rute</string>
+	<string name="menu_save_directions">Lagre anvisninger</string>
 	<string name="show_more_map_detail">Vis flere kartdetaljer</string>
 	<string name="favourites_delete_multiple_succesful">Favorittpunkt(er) vellykket slettet.</string>
 	<string name="favorite_delete_multiple">Du kommer til å slette %1$d favoritt(er) og %2$d favorittgruppe(r). Er du sikker?</string>
@@ -313,7 +312,7 @@
 	<string name="voice_not_specified">Ingen</string>
 	<string name="internet_connection_required_for_online_route">En nettbasert navigeringstjeneste er valgt, men ingen internett-tilkobling er tilgjengelig.</string>
 	<string name="tts_language_not_supported_title">Språk ikke støttet</string>
-	<string name="tts_language_not_supported">Det valgte språket støttes ikke av den installerte Android TTS(tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
+	<string name="tts_language_not_supported">Det valgte språket støttes ikke av den installerte Android TTS (tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
 	<string name="tts_missing_language_data_title">Manglende data</string>
 	<string name="switch_to_vector_map_to_see">Offline-vektorkart foreligger for dette stedet.
 \n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'.</string>
@@ -323,10 +322,10 @@
 \n\nI lokalmenyen \'Bruk posisjon\' for et punkt, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den.
 \n\nEtter å ha lagret en favoritt er den tilgjengelig via \'Meny\' → \'Mine steder\'. Trykking på en oppføring i \'Favoritter\'-listen gir muligheter som å navigere til den, redigere eller slette den.
 \n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "</string>
-	<string name="search_osm_offline">Søk adresse ved bruk av offline-kart</string>
+	<string name="search_osm_offline">Søk geografisk plassering</string>
 	<string name="system_locale">System</string>
 	<string name="preferred_locale_descr">Velg visningsspråk</string>
-	<string name="preferred_locale">Språk</string>
+	<string name="preferred_locale">Visningsspråk</string>
 	<string name="tip_map_switch">Velg en kartkilde</string>
 	<string name="tip_map_switch_t_v2">"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'.
 \n\nUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene (standard, trengs også for offline navigering), eller forhåndsdefinerte (nettbaserte eller bufret offline) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' under \'Innstillinger\' → \'Programtillegg\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC.
@@ -355,7 +354,7 @@
 \n\nEn markør-boks kan skjules igjen ved å trykke lenge på den. "</string>
 	<string name="tip_initial">Hjelp</string>
 	<string name="tip_initial_t">"OsmAnd er et navigeringsprogram med mange funksjoner.
-\n\tSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
+\n\nSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
 	<string name="next_button">Neste</string>
 	<string name="previous_button">Forrige</string>
 	<string name="unit_of_length_descr">Endre lengde- og hastighetsenhet</string>
@@ -404,7 +403,7 @@
 	<string name="daynight">Dag/natt-modus</string>
 	<string name="download_files_question">Laste ned {0} fil(er) ({1} MB)?</string>
 	<string name="items_were_selected">{0} element(er) valgt</string>
-	<string name="filter_existing_indexes">Filtrer nedlastede</string>
+	<string name="filter_existing_indexes">Nedlastet</string>
 	<string name="deselect_all">Fravelg alle</string>
 	<string name="select_all">Velg alle</string>
 	<string name="reload">Gjenoppfrisk</string>
@@ -414,7 +413,7 @@
 	<string name="context_menu_item_download_map">Last ned kart</string>
 	<string name="renderers">Vektor-opptegning</string>
 	<string name="renderers_descr">Velg utseende på opptegningen</string>
-	<string name="website">nettsted</string>
+	<string name="website">Nettsted</string>
 	<string name="phone">Telefon</string>
 	<string name="context_menu_item_search_transport">Søk transport</string>
 	<string name="transport_searching_transport">Transportresultater (ingen mål):</string>
@@ -494,8 +493,8 @@
 	<string name="searching">Søker…</string>
 	<string name="searching_address">Søker adresse…</string>
 	<string name="hint_search_online">Husnummer, gate, by</string>
-	<string name="search_offline_address">Offline</string>
-	<string name="search_online_address">Internett</string>
+	<string name="search_offline_address">Offline-søk</string>
+	<string name="search_online_address">Nettbasert søk</string>
 	<string name="max_level_download_tile">Maks. nettbasert zoom</string>
 	<string name="max_level_download_tile_descr">Velg maksimalt zoomnivå å laste ned for nettbaserte kartseksjoner</string>
 	<string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d m.</string>
@@ -503,7 +502,7 @@
 	<string name="router_service">Navigeringstjeneste</string>
 	<string name="sd_dir_not_accessible">Lagringsmappe på SD-kortet ikke tilgjengelig</string>
 	<string name="download_question">Laste ned {0} - {1} ?</string>
-	<string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere det ({2}) ?</string>
+	<string name="download_question_exist">Offline-data for {0} finnes allerede ({1}). Vil du oppdatere ({2}) ?</string>
 	<string name="address">Adresse</string>
 	<string name="download_index_success">Nedlasting vellykket</string>
 	<string name="error_io_error">I/O feil oppstod</string>
@@ -537,7 +536,7 @@
 	<string name="show_osm_bugs">Vis OpenStreet-feil</string>
 	<string name="favourites_activity">Favoritter</string>
 	<string name="add_to_favourite">Legg til i favoritter</string>
-	<string name="use_english_names_descr">Bruk lokale eller engelske navn</string>
+	<string name="use_english_names_descr">Velg mellom lokale og engelske navn</string>
 	<string name="use_english_names">Bruk engelske navn i kartene</string>
 	<string name="app_settings">Programinnstillinger</string>
 	<string name="search_address">Søk adresse</string>
@@ -545,13 +544,13 @@
 	<string name="choose_street">Velg gate</string>
 	<string name="choose_city">Velg by</string>
 	<string name="ChooseCountry">Velg land</string>
-	<string name="show_view_angle">Vis synsretningen</string>
+	<string name="show_view_angle">Vis synsretning</string>
 	<string name="map_view_3d_descr">Aktiver 3D-visning av kartet</string>
 	<string name="map_view_3d">3D-kartvisning</string>
 	<string name="show_poi_over_map_description">Vis interessepunkt over kart (bruk sist valgte filter)</string>
 	<string name="show_poi_over_map">Vis interessepunkt</string>
 	<string name="map_tile_source_descr">Velg kilden til nettbaserte eller hurtigbufrede kartdeler</string>
-	<string name="map_tile_source">Flislegg kartkilde</string>
+	<string name="map_tile_source">Fliskartkilde</string>
 	<string name="map_source">Kartkilde</string>
 	<string name="use_internet">Bruk internett</string>
 	<string name="show_location">Vis sted</string>
@@ -640,7 +639,7 @@
     <string name="access_arrival_time">Ankomsttid</string>
     <string name="map_view">Kart</string>
     <string name="prefer_motorways">Foretrekk motorveier</string>
-	<string name="prefer_in_routing_title">Foretrekk …</string>
+	<string name="prefer_in_routing_title">Foretrekk…</string>
 	<string name="prefer_in_routing_descr">Foretrekk motorveier</string>
     <string name="max_speed_none">ingen</string>
     <string name="choose_osmand_theme_descr">Velg programtema</string>
@@ -654,13 +653,13 @@
 	<string name="osmodroid_mode_on">Stopp OsMoDroid</string>    
     <string name="osmodroid_mode_off">Start OsMoDroid</string>
     <string name="announce_gpx_waypoints">Meld om GPX-rutepunkter</string>
-    <string name="speak_title">Meddel…</string>
+    <string name="speak_title">Meld om…</string>
 	<string name="speak_descr">Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser</string>
 	<string name="speak_street_names">Meddel gatenavn (TTS)</string>
-    <string name="speak_speed_limit">Meddel fartsgrense</string>
+    <string name="speak_speed_limit">Meld om fartsgrense</string>
     <string name="speak_cameras">Meld om fotobokser</string>
 	<string name="speak_traffic_warnings">Meld trafikkvarsler</string>
-    <string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Stemmevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for opplesning (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string>
+    <string name="tip_recent_changes_1_5_t">"Endringer i 1.5:↵ →\n\t* Talevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for talemeldinger (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "</string>
     <string name="osb_author_or_password_not_specified">Oppgi OSM brukernavn og passord i Innstillinger</string>
     <string name="clear_intermediate_points">Slett mellomliggende rutepunkter</string>
     <string name="keep_intermediate_points">Behold mellomliggende rutepunkter</string>
@@ -669,18 +668,18 @@
     <string name="context_menu_item_directions_from">Anvisninger fra</string>
     <string name="route_descr_map_location">Kart: </string>
     <string name="route_descr_lat_lon">Br %1$.3f, Le %2$.3f</string>
-    <string name="route_descr_current_location">Aktuell posisjon</string>
+    <string name="route_descr_current_location">Gjeldende posisjon</string>
     <string name="route_to">Til:</string>
     <string name="route_via">Via:</string>
     <string name="route_from">Fra:</string>
 	
 	
-	<string name="destination_point">Mål %1$s</string>
-    <string name="context_menu_item_destination_point">Velg som mål</string>
+	<string name="destination_point">Reisemål %1$s</string>
+    <string name="context_menu_item_destination_point">Sett som reisemål</string>
     <string name="please_select_address">Velg by eller gate først</string>
     <string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string>
     <string name="tip_map_styles">Kartstiler</string>
-	<string name="about_version">Utgave:</string>
+	<string name="about_version">Versjon:</string>
     <string name="about_settings">Om</string>
     <string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlemmer</string>
     <string name="tips_and_tricks">Hjelp</string>
@@ -692,7 +691,7 @@
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Velg eksisterende…</string>
     <string name="edit_tilesource_name">Navn</string>
-    <string name="maps_define_edit">Definer/rediger …</string>
+    <string name="maps_define_edit">Definer/rediger…</string>
 	<string name="route_is_too_long">OsmAnd offline ruteplanlegging kan ta veldig lang tid (eller ikke virke noen ganger) for punkter mere enn 200km fra hverandre. Man kan da legge til mellomliggende rutepunkter for bedre ytelse.</string>
 	<string name="auto_zoom_none">Ingen auto-zoom</string>
 	<string name="auto_zoom_close">Nært hold</string>
@@ -763,14 +762,14 @@
     <string name="lang_pt_br">Portugisisk (Brasil)</string>
     <string name="index_name_canada">Nord-Amerika - Canada</string>
     <string name="index_item_nation_addresses">adresser (hele landet)</string>
-	<string name="index_item_world_altitude_correction">Korreksjon av høyde (verden)</string>
-	<string name="index_item_world_seamarks">Sjømerkene(verden)</string>
-	<string name="index_item_world_bitcoin_payments">Bitcoinbetalinger (verden)</string>
+	<string name="index_item_world_altitude_correction">Høydekorrigering (verden)</string>
+	<string name="index_item_world_seamarks">Sjømerker (verden)</string>
+	<string name="index_item_world_bitcoin_payments">Bitcoin-betalinger (verden)</string>
 	<string name="index_item_world_basemap">Oversiktskart (verden)</string>
     <string name="index_item_world_ski">Skikart (verden)</string>
     <string name="lang_hr">Kroatisk</string>
     <string name="calculate_osmand_route_without_internet">Beregn OsmAnd rutesegment uten internett</string>
-    <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd rute for første og siste rute segment</string>
+    <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd-rute for første og siste rutesegment</string>
     <string name="osmo_settings_uuid">Unik enhets-id</string>
     <string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string>
     <string name="osmo_plugin_description"/>
@@ -946,4 +945,113 @@
 	<string name="navigation_intent_invalid">Ugyldig format: %s</string>
     <string name="hide_all_waypoints">Fjern alle</string>
 <string name="rendering_attr_shareTaxiRoutes_name">Samletaxi-ruter</string>
-    </resources>
+    <string name="continue_navigation">Fortsett navigering</string>
+    <string name="pause_navigation">Midlertidig stopp navigering</string>
+ 	<string name="rendering_attr_hideWoodScrubs_name">Skjul skog og kratt</string>
+    <string name="rendering_attr_lessDetailed_name">Færre detaljer</string>
+    <string name="sort_by_distance">Sorter etter avstand</string>
+    <string name="sort_by_name">Sorter etter navn</string>
+    <string name="selected_gpx_info_show">\n\nTrykk og hold for å se på kartet</string>
+    <string name="gpx_info_waypoints">"Rutepunkter: %1$s "</string>
+	<string name="loading_streets">Laster gater…</string>
+	<string name="loading_cities">Laster byer…</string>
+	<string name="invalid_locations">Koordinater er ugyldige!</string>
+	<string name="go_back_to_osmand">Tilbake til OsmAnd-kart</string>
+	<string name="osb_comment_dialog_add_button">Legg til kommentar</string>
+	<string name="osb_comment_dialog_success">Kommentar ble vellykket lagt til</string>
+	<string name="no_buildings_found">Ingen bygninger funnet.</string>
+    <string name="loading_streets_buildings">Laster gater/bygninger…</string>
+	<string name="osmo_activity">OpenStreetMap-overvåking</string>
+    <string name="fav_point_dublicate_message">Favorittpunktnavn er endret til %1$s for å unngå dupliserte navn.</string>
+    <string name="gpx_selection_point">Punkt %1$s</string>
+    <string name="my_favorites">Mine favoritter</string>
+    <string name="osmo_center_location">Sentrer på skjermen</string>
+    <string name="color_red">rød</string>
+	<string name="color_pink">rosa</string>
+	<string name="color_orange">orange</string>
+	<string name="color_brown">brun</string>
+	<string name="color_yellow">gul</string>
+	<string name="color_lightblue">lyseblå</string>
+	<string name="color_blue">blå</string>
+	<string name="color_green">grønn</string>
+	
+    <string name="osmo_group_info">Info</string>
+    <string name="osmo_track_interval">Loggeintervall</string>
+	<string name="osmo_group_description">Beskrivelse</string>
+    <string name="use_points_as_intermediates">Beregn rute mellom punkter</string>
+    <string name="lang_sr">Serbisk</string>
+	<string name="lang_zh_CN">Forenklet kinesisk</string>
+	<string name="lang_zh_TW">Tradisjonell kinesisk</string>
+	<string name="keep_and_add_destination_point">Legg til som målpunkt</string>
+    <string name="select_gpx">Velg GPX …</string>
+    <string name="route_descr_select_on_map">Velg på kart…</string>
+    <string name="route_descr_favorite">Favoritt…</string>
+    <string name="route_preferences">Ruteinnstillinger</string>
+    <string name="route_info">Ruteinformasjon</string>
+    <string name="calculate_osmand_route_gpx">Beregn OsmAnd offline-rute</string>
+    <string name="app_mode_truck">Lastebil</string>
+    <string name="local_index_tile_data_name">Flisdata: %1$s</string>
+    <string name="edit_tilesource_elliptic_tile">Elliptisk mercator</string>
+    <string name="delete_point">Slett punkt</string>
+    <string name="plugin_distance_point_time">tid</string>
+    <string name="plugin_distance_point_hdop">presisjon</string>
+    <string name="plugin_distance_point_speed">fart</string>
+    <string name="plugin_distance_point_ele">høyde</string>
+    <string name="plugin_distance_point">Punkt</string>
+    <string name="default_buttons_do_not_show_again">Ikke vis igjen</string>
+    <string name="use_magnetic_sensor">Bruk magnetisk sensor</string>
+    <string name="files_limit">%1$d filer igjen</string>
+    <string name="cancel_navigation">Stopp navigering</string>
+    <string name="hno">Husnummer</string>
+    <string name="select_address_activity">Velg adresse</string>
+    <string name="favourites_list_activity">Velg favoritt</string>
+    <string name="local_indexes_cat_srtm">Kotedata</string>
+    <string name="recording_context_menu_show">Vis</string>
+    <string name="srtm_paid_version_title">Programtillegg for koter</string>
+    <string name="av_settings_descr">Still inn lyd og video</string>
+    <string name="av_settings">"Lyd/video-innstillinger "</string>
+    <string name="av_control_stop">Stopp</string>
+    <string name="osmand_srtm_short_description_80_chars">OsmAnd-programtillegg for offline koter</string>
+    <string name="map_widget_distancemeasurement">Avstandsmåling</string>
+    <string name="monitoring_control_stop">Stopp</string>
+    <string name="index_srtm_ele">Koter</string>
+    <string name="srtm_plugin_name">Programtillegg for koter</string>
+    <string name="download_select_map_types">Andre kart</string>
+    <string name="download_roads_only_item">Bare veier</string>
+    <string name="download_srtm_maps">Koter</string>
+    <string name="download_regular_maps">Vanlige kart</string>
+    <string name="download_roads_only_maps">Rene veikart</string>
+    <string name="osmodroid_plugin_name">OsMoDroid-programtillegg</string>
+	<string name="tip_altitude_offset">Høydekorrigering</string>
+	<string name="search_villages_and_postcodes">Søk landsbyer/postnummer</string>
+	<string name="rendering_attr_showRoadMaps_description">Velg når det skal vises rene veikart:</string>
+	<string name="rendering_attr_showRoadMaps_name">Rene veikart</string>
+    <string name="osmand_play_title_30_chars">OsmAnd kart &amp; navigering</string>
+	<string name="osmand_plus_play_title_30_chars">OsmAnd+ kart &amp; navigering</string>
+	<string name="map_widget_view_direction">Synsretning</string>
+	<string name="gpxup_private">Privat</string>
+	<string name="share_route_as_gpx">Del rute som GPX-fil</string>
+	<string name="modify_transparency">Endre gjennomsiktighet (0 - gjennomsiktig, 255 - ugjennomsiktig)</string>
+	<string name="extra_settings">Avanserte innstillinger</string>
+	<string name="select_plugin_to_activate">Trykk på et programtillegg for å aktivere eller deaktivere det. (Omstart av OsmAnd kan være nødvendig.)</string>
+	<string name="gpx_visibility_txt">Synlighet</string>
+	<string name="gpx_description_txt">Beskrivelse</string>
+	<string name="use_transparent_map_theme">Gjennomsiktig tema</string>
+	<string name="keep_informing_never">Aldri</string>
+    <string name="local_index_installed">Utgave</string>
+	<string name="local_index_mi_export">Eksporter</string>
+	<string name="gpx_option_destination_point">Bruk gjeldende mål</string>
+	<string name="tip_location_sharing">Del en posisjon</string>
+	<string name="error_doing_search">Feil oppstod i offline-søk</string>
+	<string name="send_location">Send posisjon</string>
+	<string name="amenity_type_administrative">Administrative</string>
+	<string name="import_save">Lagre</string>
+	<string name="layer_transport_route">Transportrute</string>
+	<string name="unzipping_file">Pakker ut fil…</string>
+	<string name="transport_Stop">Stoppested</string>
+	<string name="transport_stops">Stoppesteder</string>
+	<string name="downloading_file_new">Laster ned…</string>
+	<string name="loading_postcodes">Laster postnummer…</string>
+	<string name="close">Lukk</string>
+	<string name="loading_data">Laster data…</string>
+	</resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 987be9a98b..d8c296541f 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -28,6 +28,7 @@
 	<string name="poi_bed_shop">Спальные принадлежности</string>
 	<string name="poi_boutique">Бутик</string>
 	<string name="poi_carpet_shop">Магазин ковров</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>
@@ -318,6 +319,7 @@
 	<string name="poi_rowing">Академическая гребля</string>
 	<string name="poi_rugby_union">Рэгби-юнион</string>
 	<string name="poi_rugby_league">Рэгби-лиг</string>
+	<string name="poi_sailing">Парусный спорт</string>
 	<string name="poi_shooting">Стрельба</string>
 	<string name="poi_skating">Катание на роликах (коньках)</string>
 	<string name="poi_skateboard">Скейтборд</string>
@@ -329,84 +331,84 @@
 	<string name="poi_toboggan"></string>
 	<string name="poi_volleyball">Воллейбол</string>
 
-	<string name="poi_museum"></string>
-	<string name="poi_attraction"></string>
-	<string name="poi_memorial"></string>
-	<string name="poi_artwork"></string>
-	<string name="poi_archaeological_site"></string>
-	<string name="poi_battlefield"></string>
-	<string name="poi_boundary_stone"></string>
-	<string name="poi_castle"></string>
-	<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_rune_stone"></string>
-	<string name="poi_wreck"></string>
-	<string name="poi_ship_historic"></string>
-	<string name="poi_mine_historic"></string>
-	<string name="poi_monument"></string>
-	<string name="poi_zoo"></string>
-	<string name="poi_theme_park"></string>
+	<string name="poi_museum">Музей</string>
+	<string name="poi_attraction">Достопримечательность</string>
+	<string name="poi_memorial">Памятник, мемориал</string>
+	<string name="poi_artwork">Произведение искусства</string>
+	<string name="poi_archaeological_site">Раскопки</string>
+	<string name="poi_battlefield">Поле битвы</string>
+	<string name="poi_boundary_stone">Межевой камень</string>
+	<string name="poi_castle">Замок</string>
+	<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_rune_stone">Рунический камень</string>
+	<string name="poi_wreck">Место кораблекрушения</string>
+	<string name="poi_ship_historic">Судно (музей)</string>
+	<string name="poi_mine_historic">Историческая шахта</string>
+	<string name="poi_monument">Монумент (памятник)</string>
+	<string name="poi_zoo">Зоопарк</string>
+	<string name="poi_theme_park">Парк развлечений</string>
 
-	<string name="poi_hotel"></string>
-	<string name="poi_guest_house"></string>
-	<string name="poi_hostel"></string>
-	<string name="poi_motel"></string>
-	<string name="poi_alpine_hut"></string>
-	<string name="poi_chalet"></string>
+	<string name="poi_hotel">Гостиница</string>
+	<string name="poi_guest_house">Гостевой дом</string>
+	<string name="poi_hostel">Хостел</string>
+	<string name="poi_motel">Мотель</string>
+	<string name="poi_alpine_hut">Горный приют</string>
+	<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_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_clock"></string>
-	<string name="poi_travel_agent"></string>
-	<string name="poi_viewpoint"></string>
-	<string name="poi_camp_site"></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_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_clock">Часы</string>
+	<string name="poi_travel_agent">Турагенство</string>
+	<string name="poi_viewpoint">Место с хорошим видом</string>
+	<string name="poi_camp_site">Место для лагеря</string>
 	<string name="poi_caravan_site"></string>
-	<string name="poi_picnic_site"></string>
-	<string name="poi_spring"></string>
-	<string name="poi_cemetery"></string>
-	<string name="poi_grave_yard"></string>
-	<string name="poi_shelter"></string>
-	<string name="poi_funicular"></string>
-	<string name="poi_resort"></string>
+	<string name="poi_picnic_site">Место для пикника</string>
+	<string name="poi_spring">Родник</string>
+	<string name="poi_cemetery">Кладбище</string>
+	<string name="poi_grave_yard">Кладбище (небольшое)</string>
+	<string name="poi_shelter">Укрытие от непогоды</string>
+	<string name="poi_funicular">Фуникулёр</string>
+	<string name="poi_resort">Курорт</string>
 
-	<string name="poi_club_art"></string>
-	<string name="poi_club_astronomy"></string>
-	<string name="poi_club_computer"></string>
-	<string name="poi_club_board_games"></string>
-	<string name="poi_club_motorcycle"></string>
-	<string name="poi_club_sport"></string>
-	<string name="poi_club_game"></string>
-	<string name="poi_club_automobile"></string>
-	<string name="poi_club_chess"></string>
-	<string name="poi_club_cinema"></string>
-	<string name="poi_club_fan"></string>
-	<string name="poi_club_fishing"></string>
-	<string name="poi_club_veterans"></string>
-	<string name="poi_club_linux"></string>
-	<string name="poi_club_theatre"></string>
-	<string name="poi_club_history"></string>
-	<string name="poi_club_music"></string>
-	<string name="poi_club_ethnic"></string>
-	<string name="poi_club_nature"></string>
-	<string name="poi_club_photography"></string>
-	<string name="poi_club_hunting"></string>
-	<string name="poi_club_shooting"></string>
-	<string name="poi_club_tourism"></string>
-	<string name="poi_club_charity"></string>
+	<string name="poi_club_art">Клуб любителей искусства</string>
+	<string name="poi_club_astronomy">Астрономический клуб</string>
+	<string name="poi_club_computer">Компьютерный клуб</string>
+	<string name="poi_club_board_games">Настольные игры</string>
+	<string name="poi_club_motorcycle">Мотоклуб</string>
+	<string name="poi_club_sport">Спортивный клуб</string>
+	<string name="poi_club_game">Игровой клуб</string>
+	<string name="poi_club_automobile">Автоклуб</string>
+	<string name="poi_club_chess">Шахматный клуб</string>
+	<string name="poi_club_cinema">Киноклуб</string>
+	<string name="poi_club_fan">Фанклуб</string>
+	<string name="poi_club_fishing">Клуб рыболовов</string>
+	<string name="poi_club_veterans">Клуб ветеранов</string>
+	<string name="poi_club_linux">Клуб любителей Linux</string>
+	<string name="poi_club_theatre">Театральный клуб</string>
+	<string name="poi_club_history">Исторический клуб</string>
+	<string name="poi_club_music">Музыкальный клуб</string>
+	<string name="poi_club_ethnic">Клуб этнической культуры</string>
+	<string name="poi_club_nature">Клуб натуралистов</string>
+	<string name="poi_club_photography">Фотоклуб</string>
+	<string name="poi_club_hunting">Клуб охотников</string>
+	<string name="poi_club_shooting">Оружейный клуб</string>
+	<string name="poi_club_tourism">Туристический клуб</string>
+	<string name="poi_club_charity">Благотворительский клуб</string>
 
 	<string name="poi_library">Библиотека</string>
 	<string name="poi_arts_centre">Художественный центр</string>
@@ -430,64 +432,64 @@
 	<string name="poi_water_park">Аквапарк</string>
 	<string name="poi_park">Парк</string>
 
-	<string name="poi_cafe"></string>
-	<string name="poi_biergarten"></string>
-	<string name="poi_restaurant"></string>
-	<string name="poi_fast_food"></string>
-	<string name="poi_bar"></string>
-	<string name="poi_pub"></string>
-	<string name="poi_food_court"></string>
-	<string name="poi_drinking_water"></string>
-	<string name="poi_barbecue"></string>
+	<string name="poi_cafe">Кафе</string>
+	<string name="poi_biergarten">Летнее кафе</string>
+	<string name="poi_restaurant">Ресторан</string>
+	<string name="poi_fast_food">Фастфуд (быстрое питание)</string>
+	<string name="poi_bar">Бар</string>
+	<string name="poi_pub">Паб</string>
+	<string name="poi_food_court">Ресторанный дворик</string>
+	<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_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_funeral_directors">Ритуальные услуги</string>
 	<string name="poi_computer_craft">Сборка компьютеров</string>
@@ -578,11 +580,11 @@
 	<string name="poi_seamark_rock"></string>
 	<string name="poi_seamark_wreck"></string>
 
-	<string name="poi_military_airfield"></string>
-	<string name="poi_military_bunker"></string>
-	<string name="poi_military_barracks"></string>
-	<string name="poi_military_danger_area"></string>
-	<string name="poi_military_range"></string>
-	<string name="poi_military_naval_base"></string>
-	<string name="poi_military_nuclear_explosion_site"></string>
+	<string name="poi_military_airfield">Военный аэродром</string>
+	<string name="poi_military_bunker">Военный бункер</string>
+	<string name="poi_military_barracks">Бараки</string>
+	<string name="poi_military_danger_area">Опасная зона</string>
+	<string name="poi_military_range">Военное стрельбище</string>
+	<string name="poi_military_naval_base">Военно-морская база</string>
+	<string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 8d20bad10b..4831e24774 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1771,7 +1771,7 @@
     <string name="traffic_warning_calming">Снизьте скорость</string>
     <string name="traffic_warning_speed_camera">Скоростной радар</string>
     <string name="traffic_warning">Ограничение скорости</string>
-	<string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение</string>
+	<string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение.</string>
 	<string name="speed_limit_exceed">Допустимое значение превышения скорости</string>
 	<string name="test_native_render">Тест нативной визуализации</string>
     <string name="fav_point_emoticons_message">Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 38061f4e18..a6406e5690 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -495,8 +495,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="auto_zoom_map">Zoom automàticu mapa</string>
 	<string name="snap_to_road_descr">Arrea sa positzione in subra de sas istradas durante su nàvigu</string>
 	<string name="snap_to_road">Arrea in subra de sas istradas</string>
-	<string name="interrupt_music_descr">Interrumpe sa mùsica pro faghere sos annuntzios</string>
-	<string name="interrupt_music">Interrumpe sa mùsica</string>
+	<string name="interrupt_music_descr">Firma sa mùsica pro fàghere sos annùntzios</string>
+	<string name="interrupt_music">Firma sa mùsica</string>
 	<string name="tip_recent_changes_0_8_2_t">"Mudas in sa 0.8.2:
 \n\t* Megiorau su calculu de sas àndalas
 \n\t* Widgets dinàmicos pro sas mapas
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 837ca6b5b0..93ff8794b8 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -1,95 +1,95 @@
 <?xml version="1.0" ?>
 <resources>
-	<string name="poi_bakery">Bakery shop</string>
-	<string name="poi_alcohol">Alcohol shop</string>
+	<string name="poi_bakery">Bakery</string>
+	<string name="poi_alcohol">liquor store</string>
 	<string name="poi_convenience">Convenience store</string>
 	<string name="poi_mall">Mall</string>
-	<string name="poi_beverages">Beverages shop</string>
-	<string name="poi_butcher">Butcher shop</string>
-	<string name="poi_deli">Fine foods shop</string>
-	<string name="poi_shop_farm">Farm produce shop</string>
-	<string name="poi_greengrocer">Greengrocer</string>
-	<string name="poi_seafood">Seafood shop</string>
-	<string name="poi_confectionery">Confectionery Shop</string>
-	<string name="poi_ice_cream">Ice cream</string>
+	<string name="poi_beverages">Beverage store</string>
+	<string name="poi_butcher">Meat market</string>
+	<string name="poi_deli">Deli</string>
+	<string name="poi_shop_farm">Farm shop</string>
+	<string name="poi_greengrocer">Greengrocery</string>
+	<string name="poi_seafood">Seafood store</string>
+	<string name="poi_confectionery">Confectionery</string>
+	<string name="poi_ice_cream">Ice cream parlor</string>
 	<string name="poi_supermarket">Supermarket</string>
 	<string name="poi_shop_tea">Tea shop</string>
 	<string name="poi_dairy">Dairy shop</string>
 	<string name="poi_vending_machine">Vending machine</string>
 
-	<string name="poi_bookshop">Book 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 shop</string>
+	<string name="poi_antiques_shop">Antiques store</string>
 	<string name="poi_art_shop">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 furnishing shop</string>
-	<string name="poi_bed_shop">Bed shop</string>
-	<string name="poi_boutique">Boutique shop</string>
+	<string name="poi_bathroom_furnishing_shop">Bathroom furnishings</string>
+	<string name="poi_bed_shop">Bed room furnishings</string>
+	<string name="poi_boutique">Fashion boutique</string>
 	<string name="poi_carpet_shop">Carpet shop</string>
-	<string name="poi_chemist_shop">Chemist shop</string>
-	<string name="poi_clothes_shop">Clothes shop</string>
-	<string name="poi_children_clothes_shop">Children clothes shop</string>
-	<string name="poi_shoes">Shoes shop</string>
-	<string name="poi_computer_shop">Computer shop</string>
+	<string name="poi_chemist_shop">Drug store</string>
+	<string name="poi_clothes_shop">Apparel store</string>
+	<string name="poi_children_clothes_shop">Childrens apparel</string>
+	<string name="poi_shoes">Shoe store</string>
+	<string name="poi_computer_shop">Computer store</string>
 	<string name="poi_copyshop">Copy shop</string>
 	<string name="poi_curtain_shop">Curtain shop</string>
-	<string name="poi_fabric_shop">Fabric shop</string>
-	<string name="poi_bedding_shop">Bedding shop</string>
-	<string name="poi_dive_shop">Dive shop</string>
-	<string name="poi_doityourself_shop">Do-It-Yourself shop</string>
-	<string name="poi_erotic_shop">Sex shop</string>
-	<string name="poi_fishing_shop">Fishing shop</string>
-	<string name="poi_florist">Florist shop</string>
-	<string name="poi_frame_shop">Frame shop</string>
-	<string name="poi_furniture_shop">Furniture shop</string>
-	<string name="poi_garden_centre">Garden centre</string>
-	<string name="poi_gas_shop">Bottled gas shop</string>
-	<string name="poi_general_shop">General 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_florist">Flower shop</string>
+	<string name="poi_frame_shop">Picture frame shop</string>
+	<string name="poi_furniture_shop">Furniture store</string>
+	<string name="poi_garden_centre">Garden center</string>
+	<string name="poi_gas_shop">Liquid gas store</string>
+	<string name="poi_general_shop">General store</string>
 	<string name="poi_gift_shop">Gift shop</string>
-	<string name="poi_glaziery_shop">Glaziery shop</string>
-	<string name="poi_hardware_shop">Hardware shop</string>
-	<string name="poi_hearing_aids_shop">Hearing aids shop</string>
-	<string name="poi_herbalist">Herbalist shop</string>
-	<string name="poi_hifi_shop">HiFi shop</string>
-	<string name="poi_houseware_shop">Houseware shop</string>
-	<string name="poi_hunting_shop">Hunting shop</string>
-	<string name="poi_interior_decoration_shop">Interior decoration shop</string>
-	<string name="poi_jewelry_shop">Jewelry 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_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_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Kitchen shop</string>
-	<string name="poi_mobile_phone_shop">Mobile phone shop</string>
+	<string name="poi_kitchen_shop">Kitchenware</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 instrument shop</string>
-	<string name="poi_newsagent_shop">Newsagent shop</string>
-	<string name="poi_optician_shop">Optician shop</string>
-	<string name="poi_organic_shop">Organic store</string>
-	<string name="poi_outdoor_shop">Outdoor shop</string>
+	<string name="poi_musical_instrument_shop">Musical instruments</string>
+	<string name="poi_newsagent_shop">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 shop</string>
-	<string name="poi_second_hand">Second hand shop</string>
+	<string name="poi_radiotechnics_shop">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">Sports shop</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 shop</string>
-	<string name="poi_toys_shop">Toys shop</string>
-	<string name="poi_trade_shop">Trade shop</string>
-	<string name="poi_vacuum_cleaner_shop">Vacuum cleaner 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_variety_store">Variety store</string>
-	<string name="poi_video_shop">Video shop</string>
-	<string name="poi_window_blind_shop">Window blind shop</string>
+	<string name="poi_video_shop">Video store</string>
+	<string name="poi_window_blind_shop">Window blind store</string>
 	<string name="poi_department_store">Department store</string>
-	<string name="poi_electronics_shop">Electronics shop</string>
+	<string name="poi_electronics_shop">Electronics store</string>
 	<string name="poi_car_shop">Car shop</string>
-	<string name="poi_car_parts_shop">Car parts shop</string>
-	<string name="poi_atv_shop">Quad shop</string>
-	<string name="poi_cosmetics_shop">Cosmetics shop</string>
+	<string name="poi_car_parts_shop">Car parts</string>
+	<string name="poi_atv_shop">Quad store</string>
+	<string name="poi_cosmetics_shop">Cosmetics</string>
 	<string name="poi_marketplace">Marketplace</string>
-	<string name="poi_sewing_shop">Sewing shop</string>
+	<string name="poi_sewing_shop">Dry goods store</string>
 
 	<string name="poi_police">Police</string>
 	<string name="poi_fire_station">Fire station</string>
@@ -118,13 +118,13 @@
 	<string name="poi_traffic_calming_rumble_strip">Rumble strip</string>
 	<string name="poi_traffic_calming_table">Table</string>
 	<string name="poi_traffic_calming_choker">Choker</string>
-	<string name="poi_traffic_signals">Traffic signals</string>
+	<string name="poi_traffic_signals">Stop light</string>
 
 	<string name="poi_car_repair">Car repair</string>
-	<string name="poi_service_tyres">Tire</string>
+	<string name="poi_service_tyres">Tires</string>
 	<string name="poi_vehicle_inspection">Vehicle inspection</string>
 	<string name="poi_car_wash">Car wash</string>
-	<string name="poi_fuel">Petrol station</string>
+	<string name="poi_fuel">Gas station</string>
 	<string name="poi_charging_station">Charging station</string>
 	<string name="poi_vehicle_ramp">Vehicle ramp</string>
 	<string name="poi_compressed_air">Compressed air</string>
@@ -231,7 +231,7 @@
 	<string name="poi_social_facility">Social facility</string>
 	<string name="poi_courthouse">Courthouse</string>
 	<string name="poi_prison">Prison</string>
-	<string name="poi_register_office">Register office</string>
+	<string name="poi_register_office">Civil registry office</string>
 	<string name="poi_embassy">Embassy</string>
 	<string name="poi_government">Government</string>
 	<string name="poi_bailiff">Bailiff</string>
@@ -378,7 +378,7 @@
 	<string name="poi_picnic_site">Picnic site</string>
 	<string name="poi_spring">Spring</string>
 	<string name="poi_cemetery">Cemetery</string>
-	<string name="poi_grave_yard">Grave yard</string>
+	<string name="poi_grave_yard">Graveyard</string>
 	<string name="poi_shelter">Shelter</string>
 	<string name="poi_funicular">Funicular</string>
 	<string name="poi_resort">Resort</string>
@@ -388,7 +388,7 @@
 	<string name="poi_club_computer">Computer club</string>
 	<string name="poi_club_board_games">Board games club</string>
 	<string name="poi_club_motorcycle">Motorcycle club</string>
-	<string name="poi_club_sport">Sport club</string>
+	<string name="poi_club_sport">Sports club</string>
 	<string name="poi_club_game">Game club</string>
 	<string name="poi_club_automobile">Automobile club</string>
 	<string name="poi_club_chess">Chess club</string>
@@ -397,7 +397,7 @@
 	<string name="poi_club_fishing">Fishing club</string>
 	<string name="poi_club_veterans">Veterans club</string>
 	<string name="poi_club_linux">Linux club</string>
-	<string name="poi_club_theatre">Theatre club</string>
+	<string name="poi_club_theatre">Theater club</string>
 	<string name="poi_club_history">History club</string>
 	<string name="poi_club_music">Music club</string>
 	<string name="poi_club_ethnic">Ethnic club</string>
@@ -501,7 +501,7 @@
 	<string name="poi_car_rental">Car rental</string>
 	<string name="poi_car_sharing">Car sharing</string>
 	<string name="poi_boat_sharing">Boat sharing</string>
-	<string name="poi_toilets">Toilets</string>
+	<string name="poi_toilets">Restroom</string>
 	<string name="poi_sauna">Sauna</string>
 	<string name="poi_brothel">Brothel</string>
 	<string name="poi_mortuary">Mortuary</string>
diff --git a/OsmAnd/src/net/osmand/core/android/GLActivity.java b/OsmAnd/src/net/osmand/core/android/GLActivity.java
index e92dac0dad..fd588dd5fb 100644
--- a/OsmAnd/src/net/osmand/core/android/GLActivity.java
+++ b/OsmAnd/src/net/osmand/core/android/GLActivity.java
@@ -54,11 +54,11 @@ public class GLActivity extends Activity {
     private ResolvedMapStyle _mapStyle;
     private ObfsCollection _obfsCollection;
     private MapPresentationEnvironment _mapPresentationEnvironment;
-    private Primitiviser _primitiviser;
-    private BinaryMapDataProvider _binaryMapDataProvider;
-    private BinaryMapPrimitivesProvider _binaryMapPrimitivesProvider;
-    private BinaryMapStaticSymbolsProvider _binaryMapStaticSymbolsProvider;
-    private BinaryMapRasterLayerProvider _binaryMapRasterLayerProvider;
+    private MapPrimitiviser _mapPrimitiviser;
+    private ObfMapObjectsProvider _obfMapObjectsProvider;
+    private MapPrimitivesProvider _mapPrimitivesProvider;
+    private MapObjectsSymbolsProvider _mapObjectsSymbolsProvider;
+    private MapRasterLayerProvider _mapRasterLayerProvider;
 	private OnlineRasterMapLayerProvider _onlineMapRasterLayerProvider;
     private IMapRenderer _mapRenderer;
     private GpuWorkerThreadPrologue _gpuWorkerThreadPrologue;
@@ -194,19 +194,19 @@ public class GLActivity extends Activity {
                 _displayDensityFactor,
                 "en"); //TODO: here should be current locale
         //mapPresentationEnvironment->setSettings(configuration.styleSettings);
-        _primitiviser = new Primitiviser(
+        _mapPrimitiviser = new MapPrimitiviser(
                 _mapPresentationEnvironment);
-        _binaryMapDataProvider = new BinaryMapDataProvider(
+        _obfMapObjectsProvider = new ObfMapObjectsProvider(
                 _obfsCollection);
-        _binaryMapPrimitivesProvider = new BinaryMapPrimitivesProvider(
-                _binaryMapDataProvider,
-                _primitiviser,
+        _mapPrimitivesProvider = new MapPrimitivesProvider(
+                _obfMapObjectsProvider,
+                _mapPrimitiviser,
                 _rasterTileSize);
-        _binaryMapStaticSymbolsProvider = new BinaryMapStaticSymbolsProvider(
-                _binaryMapPrimitivesProvider,
+        _mapObjectsSymbolsProvider = new MapObjectsSymbolsProvider(
+                _mapPrimitivesProvider,
                 _rasterTileSize);
-        _binaryMapRasterLayerProvider = new BinaryMapRasterLayerProvider_Software(
-                _binaryMapPrimitivesProvider);
+        _mapRasterLayerProvider = new MapRasterLayerProvider_Software(
+                _mapPrimitivesProvider);
 
 		_onlineMapRasterLayerProvider = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
 
@@ -222,14 +222,14 @@ public class GLActivity extends Activity {
         atlasRendererConfiguration.setReferenceTileSizeOnScreenInPixels(_referenceTileSize);
         _mapRenderer.setConfiguration(AtlasMapRendererConfiguration.Casts.downcastTo_MapRendererConfiguration(atlasRendererConfiguration));
 
-        _mapRenderer.addSymbolsProvider(_binaryMapStaticSymbolsProvider);
+        _mapRenderer.addSymbolsProvider(_mapObjectsSymbolsProvider);
         updateView();
         /*
         IMapRasterLayerProvider mapnik = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
         if (mapnik == null)
             Log.e(TAG, "Failed to create mapnik");
         */
-        _mapRenderer.setMapLayerProvider(0, _binaryMapRasterLayerProvider);
+        _mapRenderer.setMapLayerProvider(0, _mapRasterLayerProvider);
 
         _glSurfaceView = (GLSurfaceView) findViewById(R.id.glSurfaceView);
         //TODO:_glSurfaceView.setPreserveEGLContextOnPause(true);
@@ -289,29 +289,29 @@ public class GLActivity extends Activity {
             _mapPresentationEnvironment = null;
         }
 
-        if (_primitiviser != null) {
-            _primitiviser.delete();
-            _primitiviser = null;
+        if (_mapPrimitiviser != null) {
+            _mapPrimitiviser.delete();
+            _mapPrimitiviser = null;
         }
 
-        if (_binaryMapDataProvider != null) {
-            _binaryMapDataProvider.delete();
-            _binaryMapDataProvider = null;
+        if (_obfMapObjectsProvider != null) {
+            _obfMapObjectsProvider.delete();
+            _obfMapObjectsProvider = null;
         }
 
-        if (_binaryMapPrimitivesProvider != null) {
-            _binaryMapPrimitivesProvider.delete();
-            _binaryMapPrimitivesProvider = null;
+        if (_mapPrimitivesProvider != null) {
+            _mapPrimitivesProvider.delete();
+            _mapPrimitivesProvider = null;
         }
 
-        if (_binaryMapStaticSymbolsProvider != null) {
-            _binaryMapStaticSymbolsProvider.delete();
-            _binaryMapStaticSymbolsProvider = null;
+        if (_mapObjectsSymbolsProvider != null) {
+            _mapObjectsSymbolsProvider.delete();
+            _mapObjectsSymbolsProvider = null;
         }
 
-        if (_binaryMapRasterLayerProvider != null) {
-            _binaryMapRasterLayerProvider.delete();
-            _binaryMapRasterLayerProvider = null;
+        if (_mapRasterLayerProvider != null) {
+            _mapRasterLayerProvider.delete();
+            _mapRasterLayerProvider = null;
         }
 
         if (_mapRenderer != null) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 0d8f2adca9..c38531761a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -856,7 +856,7 @@ public class MapActivity extends AccessibleActivity implements
 		
 		if (mDevicePolicyManager != null && mDeviceAdmin != null) {
 			final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get();
-			if (screenPowerSave > 0) {
+			if (screenPowerSave > 0 && settings.MAP_ACTIVITY_ENABLED.get()) {
 				if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) {
 					try {
 						mDevicePolicyManager.lockNow();
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index 05eea78699..af8591497b 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -148,7 +148,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 
 	public void updateSettings(){
 		if (mapView != null) {
-			if (settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS || routePlanningMode) {
+			if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE || routePlanningMode) {
 				mapView.setRotate(0);
 			}
 			mapView.setMapPosition(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 364df26bd7..3f0e10aada 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -100,7 +100,6 @@ public class DownloadActivity extends SherlockFragmentActivity {
 
 		tabHost.setCurrentTab(0);
 
-		
 		settings = ((OsmandApplication)getApplication()).getSettings();
 
 		indeterminateProgressBar = (ProgressBar) findViewById(R.id.IndeterminateProgressBar);
@@ -448,7 +447,11 @@ public class DownloadActivity extends SherlockFragmentActivity {
 	public void downloadedIndexes(){
 		for(WeakReference<Fragment> ref : fragList) {
 			Fragment f = ref.get();
-			if(f instanceof DownloadIndexFragment) {
+			if(f instanceof LocalIndexesFragment){
+				if(!f.isDetached()){
+					((LocalIndexesFragment) f).reloadData();
+				}
+			} else if(f instanceof DownloadIndexFragment) {
 				if(!f.isDetached()) {
 					DownloadIndexAdapter adapter = ((DownloadIndexAdapter)((DownloadIndexFragment) f).getExpandableListAdapter());
 					if (adapter != null) {
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 2b830af740..19ebdb4e53 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -114,8 +114,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 	public void onResume() {
 		super.onResume();
 		if (asyncLoader == null || asyncLoader.getResult() == null) {
-			asyncLoader = new LoadLocalIndexTask();
-			asyncLoader.execute(getActivity());
+			reloadData();
 		}
 
 		getExpandableListView().setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
@@ -131,8 +130,13 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			}
 		});
 	}
-	
-	
+
+	public void reloadData() {
+		asyncLoader = new LoadLocalIndexTask();
+		asyncLoader.execute(getActivity());
+	}
+
+
 	private void showContextMenu(final LocalIndexInfo info) {
 		Builder builder = new AlertDialog.Builder(getActivity());
 		final ContextMenuAdapter adapter = new ContextMenuAdapter(getActivity());
@@ -241,6 +245,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void onPreExecute() {
 			getDownloadActivity().setSupportProgressBarIndeterminateVisibility(true);
+			listAdapter.clear();
 		}
 
 		@Override
@@ -383,9 +388,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 		protected void onPostExecute(String result) {
 			getDownloadActivity().setProgressBarIndeterminateVisibility(false);
 			AccessibleToast.makeText(getDownloadActivity(), result, Toast.LENGTH_LONG).show();
-			listAdapter.clear();
-			reloadIndexes();
-			
+			if (operation == RESTORE_OPERATION){
+				listAdapter.clear();
+				reloadIndexes();
+			}
 		}
 	}
 	
@@ -470,7 +476,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()){
 				listAdapter.addLocalIndexInfo(info);
 			}
-			listAdapter.notifyDataSetChanged();
+			listAdapter.sortData();
 		}
 		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
 		//hide action bar from downloadindexfragment
@@ -773,10 +779,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			final Collator cl = Collator.getInstance();
 			for(List<LocalIndexInfo> i : data.values()) {
 				Collections.sort(i, new Comparator<LocalIndexInfo>() {
-
 					@Override
 					public int compare(LocalIndexInfo lhs, LocalIndexInfo rhs) {
-						return cl.compare(lhs.getName(), rhs.getName());
+						return cl.compare(getNameToDisplay(lhs), getNameToDisplay(rhs));
 					}
 				});
 			}
@@ -800,6 +805,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 				LocalIndexInfo c = findCategory(i, i.isBackupedData());
 				if(c != null){
 					data.get(c).remove(i);
+					if (data.get(c).size() == 0){
+						data.remove(c);
+						category.remove(c);
+					}
 				}
 			}
 			listAdapter.notifyDataSetChanged();
@@ -892,14 +901,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
 			}
 			TextView viewName = ((TextView) v.findViewById(R.id.local_index_name));
-			String mapDescr = getMapDescription(child.getFileName());
-			String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName());
-
-			if (mapDescr.length() > 0){
-				viewName.setText(mapDescr + " - " + mapName);
-			} else {
-				viewName.setText(mapName);
-			}
+			viewName.setText(getNameToDisplay(child));
 			if (child.isNotSupported()) {
 				viewName.setTextColor(warningColor);
 				viewName.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
@@ -957,6 +959,17 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			return v;
 		}
 
+		private String getNameToDisplay(LocalIndexInfo child) {
+			String mapDescr = getMapDescription(child.getFileName());
+			String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName());
+
+			if (mapDescr.length() > 0){
+				 return mapDescr + " - " + mapName;
+			} else {
+				return mapName;
+			}
+		}
+
 		@Override
 		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
 			View v = convertView;
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index fd193284d1..3a123d86af 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -84,7 +84,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 			return;
 		}
 
-		List<DownloadEntry> download = e.createDownloadEntry(getMyApplication(), getDownloadActivity().getDownloadType(), new ArrayList<DownloadEntry>());
+		List<DownloadEntry> download = e.createDownloadEntry(getMyApplication(), e.getType(), new ArrayList<DownloadEntry>());
 		if (download.size() > 0) {
 			getDownloadActivity().getEntriesToDownload().put(e, download);
 			getDownloadActivity().updateDownloadButton(true);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index 7d49fdae14..176f3aa7ef 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -41,6 +41,7 @@ import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
 import android.view.Gravity;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -312,6 +313,9 @@ public class EditingPOIActivity implements DialogProvider {
 	private Dialog createPOIDialog(final int dialogID, Bundle args) {
 		final Dialog dlg = new Dialog(ctx);
 		dlg.setContentView(R.layout.editing_poi);
+		
+		dlg.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);;
+		
 		nameText = ((EditText)dlg.findViewById(R.id.Name));
 		openingHours = ((EditText)dlg.findViewById(R.id.OpeningHours));
 		typeText = ((AutoCompleteTextView)dlg.findViewById(R.id.Type));
diff --git a/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java b/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
index 69eeb661f0..1fbfb61893 100644
--- a/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
+++ b/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
@@ -12,10 +12,10 @@ import javax.microedition.khronos.egl.EGLSurface;
 
 import net.osmand.core.android.CoreResourcesFromAndroidAssetsCustom;
 import net.osmand.core.jni.AtlasMapRendererConfiguration;
-import net.osmand.core.jni.BinaryMapDataProvider;
-import net.osmand.core.jni.BinaryMapPrimitivesProvider;
-import net.osmand.core.jni.BinaryMapRasterLayerProvider_Software;
-import net.osmand.core.jni.BinaryMapStaticSymbolsProvider;
+import net.osmand.core.jni.ObfMapObjectsProvider;
+import net.osmand.core.jni.MapPrimitivesProvider;
+import net.osmand.core.jni.MapRasterLayerProvider_Software;
+import net.osmand.core.jni.MapObjectsSymbolsProvider;
 import net.osmand.core.jni.IMapRenderer;
 import net.osmand.core.jni.Logger;
 import net.osmand.core.jni.MapPresentationEnvironment;
@@ -26,7 +26,7 @@ import net.osmand.core.jni.ObfsCollection;
 import net.osmand.core.jni.OnlineRasterMapLayerProvider;
 import net.osmand.core.jni.OnlineTileSources;
 import net.osmand.core.jni.OsmAndCore;
-import net.osmand.core.jni.Primitiviser;
+import net.osmand.core.jni.MapPrimitiviser;
 import net.osmand.core.jni.QIODeviceLogSink;
 import net.osmand.core.jni.ResolvedMapStyle;
 import net.osmand.plus.OsmandApplication;
@@ -158,15 +158,15 @@ public class NativeQtLibrary {
 			MapPresentationEnvironment presentation = notGc(new MapPresentationEnvironment(mapStyle, displayDensityFactor, "en")); 
 			//TODO: here should be current locale
 			//mapPresentationEnvironment->setSettings(configuration.styleSettings);
-			BinaryMapPrimitivesProvider binaryMapPrimitivesProvider = notGc(new BinaryMapPrimitivesProvider(
-					notGc(new BinaryMapDataProvider(obfsCollection)), 
-					notGc(new Primitiviser(presentation)), rasterTileSize));
-			BinaryMapRasterLayerProvider_Software binaryMapRasterLayerProvider = notGc(new BinaryMapRasterLayerProvider_Software(
-					binaryMapPrimitivesProvider));
-			mapRenderer.setMapLayerProvider(0, binaryMapRasterLayerProvider);
-			BinaryMapStaticSymbolsProvider binaryMapStaticSymbolsProvider = notGc(new BinaryMapStaticSymbolsProvider(
-					binaryMapPrimitivesProvider, rasterTileSize));
-			mapRenderer.addSymbolsProvider(binaryMapStaticSymbolsProvider);
+			MapPrimitivesProvider mapPrimitivesProvider = notGc(new MapPrimitivesProvider(
+					notGc(new ObfMapObjectsProvider(obfsCollection)), 
+					notGc(new MapPrimitiviser(presentation)), rasterTileSize));
+			MapRasterLayerProvider_Software mapRasterLayerProvider = notGc(new MapRasterLayerProvider_Software(
+					mapPrimitivesProvider));
+			mapRenderer.setMapLayerProvider(0, mapRasterLayerProvider);
+			MapObjectsSymbolsProvider mapObjectsSymbolsProvider = notGc(new MapObjectsSymbolsProvider(
+					mapPrimitivesProvider, rasterTileSize));
+			mapRenderer.addSymbolsProvider(mapObjectsSymbolsProvider);
 		} else {
 			OnlineRasterMapLayerProvider onlineMapRasterLayerProvider = notGc(OnlineTileSources.getBuiltIn()
 					.createProviderFor("Mapnik (OsmAnd)"));