diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml
index 08599b598f..4c07a8de3d 100644
--- a/OsmAnd/res/layout/editing_poi.xml
+++ b/OsmAnd/res/layout/editing_poi.xml
@@ -217,7 +217,6 @@
         </LinearLayout>
 
         <TextView
-            android:id="@id/TextView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 5c6fb3e4a5..69343c01e3 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -47,11 +47,9 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@id/TableRow"
                     android:layout_marginLeft="5dp">
 
                     <TextView
-                        android:id="@id/TextView"
                         android:text="@string/search_address_city" />
 
                     <Button
@@ -71,11 +69,9 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@id/TableRow"
                     android:layout_marginLeft="5dp">
 
                     <TextView
-                        android:id="@id/TextView"
                         android:text="@string/search_address_street" />
 
                     <Button
@@ -95,7 +91,6 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@id/TableRow"
                     android:layout_marginLeft="5dp">
 
                     <TextView
diff --git a/OsmAnd/res/layout/send_gpx_osm.xml b/OsmAnd/res/layout/send_gpx_osm.xml
index 34f504932c..15deea12bd 100644
--- a/OsmAnd/res/layout/send_gpx_osm.xml
+++ b/OsmAnd/res/layout/send_gpx_osm.xml
@@ -34,7 +34,6 @@
     <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" />
@@ -51,7 +50,6 @@
     <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" />
diff --git a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
index ad4db5850b..9c3dfacf19 100644
--- a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
+++ b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
@@ -200,7 +200,7 @@ public class MapRendererContext {
 		}
 		// Create new OBF map symbols provider
 		obfMapSymbolsProvider = new MapObjectsSymbolsProvider(mapPrimitivesProvider, getReferenceTileSize(),
-				app.getSettings().TEXT_SCALE.get() / Math.max(1, density) );
+				app.getSettings().TEXT_SCALE.get());
 		// If there's bound view, add new provider
 		if (mapRendererView != null) {
 			mapRendererView.addSymbolsProvider(obfMapSymbolsProvider);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
old mode 100644
new mode 100755
index a3fd546653..37cd8de3a9
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -141,7 +141,7 @@ public class MapActivityActions implements DialogProvider {
 		builder.setTitle(R.string.add_waypoint_dialog_title);
 		FrameLayout parent = new FrameLayout(mapActivity);
 		final EditText editText = new EditText(mapActivity);
-		editText.setId(R.id.TextView);
+		editText.setId(android.R.id.edit);
 		parent.setPadding(15, 0, 15, 0);
 		parent.addView(editText);
 		builder.setView(parent);
@@ -540,7 +540,7 @@ public class MapActivityActions implements DialogProvider {
 					args.getDouble(KEY_LATITUDE), args.getDouble(KEY_LONGITUDE),args.getString(KEY_NAME));
 			break;
 		case DIALOG_ADD_WAYPOINT:
-			EditText v = (EditText) dialog.getWindow().findViewById(R.id.TextView);
+			EditText v = (EditText) dialog.getWindow().findViewById(android.R.id.edit);
 			v.setPadding(5, 0, 5, 0);
 			if(args.getString(KEY_NAME) != null) {
 				v.setText(args.getString(KEY_NAME));