diff --git a/OsmAnd/.classpath b/OsmAnd/.classpath
index 668632a181..107ea5f643 100644
--- a/OsmAnd/.classpath
+++ b/OsmAnd/.classpath
@@ -5,5 +5,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 35c8a0998b..0df9000fd9 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -52,34 +52,7 @@
 	</target>
 
 
-	<!-- Puts the project's resources into the output package file
-         This actually can create multiple resource package in case
-         Some custom apk with specific configuration have been
-         declared in default.properties.
-         -->
-	<target name="-package-resources" depends="-crunch">
-		<!-- only package resources if *not* a library project -->
-		<do-only-if-not-library elseText="Library project: do not package resources...">
-			<aapt executable="${aapt}" command="package" versioncode="${version.code}" versionname="${version.name}" debug="${build.is.packaging.debug}" manifest="${out.manifest.abs.file}" assets="${asset.absolute.dir}" androidjar="${project.target.android.jar}" apkfolder="${out.absolute.dir}" nocrunch="${build.packaging.nocrunch}" resourcefilename="${resource.package.file.name}" resourcefilter="${aapt.resource.filter}" libraryResFolderPathRefid="project.library.res.folder.path" libraryPackagesRefid="project.library.packages" previousBuildType="${build.last.target}" buildType="${build.target}" ignoreAssets="${aapt.ignore.assets}"  >
-				<res path="${out.res.absolute.dir}" />
-				<res path="${resource.absolute.dir}" />
-				<!-- <nocompress /> forces no compression on any files in assets or res/raw -->
-				<!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw -->
-			</aapt>
-		</do-only-if-not-library>
 
-		<!-- osmchange -->
-		<echo>Packaging aditional OsmAnd resources and assets... to ${out.packaged.file} from ${raw.absolute.dir}</echo>
-		<exec executable="${aapt}">
-			<!-- failonerror="true"> -->
-			<arg value="package" />
-			<arg value="-u" />
-			<arg value="-F" />
-			<arg value="${out.absolute.dir}/${resource.package.file.name}" />
-			<arg value="${raw.absolute.dir}" />
-		</exec>
-		<!-- osmchange -->
-	</target>
 
 	<!-- Extra target -->
 	<target name="-pre-build" depends="copy_resources,fix_apostrophe_issues">
diff --git a/OsmAnd/res/drawable-hdpi/mx_accomodation.png b/OsmAnd/res/drawable-hdpi/mx_accomodation.png
index 27c4ef7c4d..133ded3a2f 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_accomodation.png and b/OsmAnd/res/drawable-hdpi/mx_accomodation.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_arts_centre.png b/OsmAnd/res/drawable-hdpi/mx_amenity_arts_centre.png
index e1dfecbc4d..4f5b872fec 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_arts_centre.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_arts_centre.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_casino.png b/OsmAnd/res/drawable-hdpi/mx_amenity_casino.png
index 2faeb6d8d9..a6f128a60b 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_casino.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_casino.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_cinema.png b/OsmAnd/res/drawable-hdpi/mx_amenity_cinema.png
index 29a7949407..6d72eae6ae 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_cinema.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_cinema.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_college.png b/OsmAnd/res/drawable-hdpi/mx_amenity_college.png
index ff12f12374..b435c17d74 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_college.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_college.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_kindergarten.png b/OsmAnd/res/drawable-hdpi/mx_amenity_kindergarten.png
index e1e55ec38a..f9d5f052e9 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_kindergarten.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_kindergarten.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_school.png b/OsmAnd/res/drawable-hdpi/mx_amenity_school.png
index 2d9653ea7e..a6bf647829 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_school.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_school.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_shelter.png b/OsmAnd/res/drawable-hdpi/mx_amenity_shelter.png
index 23eaef8430..ac46357edd 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_shelter.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_shelter.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_theatre.png b/OsmAnd/res/drawable-hdpi/mx_amenity_theatre.png
index a5989d970c..d87f27bdcd 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_theatre.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_theatre.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_amenity_university.png b/OsmAnd/res/drawable-hdpi/mx_amenity_university.png
index f234db87f9..33db3c042a 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_amenity_university.png and b/OsmAnd/res/drawable-hdpi/mx_amenity_university.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_education.png b/OsmAnd/res/drawable-hdpi/mx_education.png
index f234db87f9..33db3c042a 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_education.png and b/OsmAnd/res/drawable-hdpi/mx_education.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_entertainment.png b/OsmAnd/res/drawable-hdpi/mx_entertainment.png
index 29a7949407..6d72eae6ae 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_entertainment.png and b/OsmAnd/res/drawable-hdpi/mx_entertainment.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_for_tourists.png b/OsmAnd/res/drawable-hdpi/mx_for_tourists.png
index e39c66cc09..5edd160470 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_for_tourists.png and b/OsmAnd/res/drawable-hdpi/mx_for_tourists.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic.png b/OsmAnd/res/drawable-hdpi/mx_historic.png
index cbd3836be3..a4a827c0f5 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic.png and b/OsmAnd/res/drawable-hdpi/mx_historic.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_archaeological_site.png b/OsmAnd/res/drawable-hdpi/mx_historic_archaeological_site.png
index cbd3836be3..a4a827c0f5 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_archaeological_site.png and b/OsmAnd/res/drawable-hdpi/mx_historic_archaeological_site.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_battlefield.png b/OsmAnd/res/drawable-hdpi/mx_historic_battlefield.png
index 4c85fd5d52..f00f185d30 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_battlefield.png and b/OsmAnd/res/drawable-hdpi/mx_historic_battlefield.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_castle.png b/OsmAnd/res/drawable-hdpi/mx_historic_castle.png
index a340f4741b..a2ba82509b 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_castle.png and b/OsmAnd/res/drawable-hdpi/mx_historic_castle.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_fort.png b/OsmAnd/res/drawable-hdpi/mx_historic_fort.png
index a340f4741b..a2ba82509b 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_fort.png and b/OsmAnd/res/drawable-hdpi/mx_historic_fort.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_memorial.png b/OsmAnd/res/drawable-hdpi/mx_historic_memorial.png
index bcc5da92c6..31bbd8f674 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_memorial.png and b/OsmAnd/res/drawable-hdpi/mx_historic_memorial.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_monument.png b/OsmAnd/res/drawable-hdpi/mx_historic_monument.png
index 43ee31287a..34e031998d 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_monument.png and b/OsmAnd/res/drawable-hdpi/mx_historic_monument.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_ruins.png b/OsmAnd/res/drawable-hdpi/mx_historic_ruins.png
index bb0df6b702..c66bcd8d5d 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_ruins.png and b/OsmAnd/res/drawable-hdpi/mx_historic_ruins.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_wayside_cross.png b/OsmAnd/res/drawable-hdpi/mx_historic_wayside_cross.png
index 3b83622f4a..1e78bcd595 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_wayside_cross.png and b/OsmAnd/res/drawable-hdpi/mx_historic_wayside_cross.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_wayside_shrine.png b/OsmAnd/res/drawable-hdpi/mx_historic_wayside_shrine.png
index d1e40d771c..0a19dbbac4 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_wayside_shrine.png and b/OsmAnd/res/drawable-hdpi/mx_historic_wayside_shrine.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_historic_wreck.png b/OsmAnd/res/drawable-hdpi/mx_historic_wreck.png
index b0312f1878..ae3e785f6d 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_historic_wreck.png and b/OsmAnd/res/drawable-hdpi/mx_historic_wreck.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_leisure_ice_rink.png b/OsmAnd/res/drawable-hdpi/mx_leisure_ice_rink.png
index f3037d45c8..2ee22752ef 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_leisure_ice_rink.png and b/OsmAnd/res/drawable-hdpi/mx_leisure_ice_rink.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_leisure_sports_centre.png b/OsmAnd/res/drawable-hdpi/mx_leisure_sports_centre.png
index 829c4769bd..5971456e46 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_leisure_sports_centre.png and b/OsmAnd/res/drawable-hdpi/mx_leisure_sports_centre.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_leisure_stadium.png b/OsmAnd/res/drawable-hdpi/mx_leisure_stadium.png
index 80f069a600..e958014153 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_leisure_stadium.png and b/OsmAnd/res/drawable-hdpi/mx_leisure_stadium.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_leisure_water_park.png b/OsmAnd/res/drawable-hdpi/mx_leisure_water_park.png
index 35f25cfc57..6d259226c1 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_leisure_water_park.png and b/OsmAnd/res/drawable-hdpi/mx_leisure_water_park.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_man_made_water_tower.png b/OsmAnd/res/drawable-hdpi/mx_man_made_water_tower.png
index de42550b5a..3662129548 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_man_made_water_tower.png and b/OsmAnd/res/drawable-hdpi/mx_man_made_water_tower.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_man_made_windmill.png b/OsmAnd/res/drawable-hdpi/mx_man_made_windmill.png
index 41e9f4ffb0..ec667b1a2f 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_man_made_windmill.png and b/OsmAnd/res/drawable-hdpi/mx_man_made_windmill.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_natural_beach.png b/OsmAnd/res/drawable-hdpi/mx_natural_beach.png
index b403ca7b49..b945909347 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_natural_beach.png and b/OsmAnd/res/drawable-hdpi/mx_natural_beach.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_railway_station.png b/OsmAnd/res/drawable-hdpi/mx_railway_station.png
index 71cedf25a8..19940d238d 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_railway_station.png and b/OsmAnd/res/drawable-hdpi/mx_railway_station.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sightseeing.png b/OsmAnd/res/drawable-hdpi/mx_sightseeing.png
index a340f4741b..a2ba82509b 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sightseeing.png and b/OsmAnd/res/drawable-hdpi/mx_sightseeing.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport.png b/OsmAnd/res/drawable-hdpi/mx_sport.png
index 35f25cfc57..6d259226c1 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport.png and b/OsmAnd/res/drawable-hdpi/mx_sport.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_archery.png b/OsmAnd/res/drawable-hdpi/mx_sport_archery.png
index 3eb77ad1c1..1898007fe0 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_archery.png and b/OsmAnd/res/drawable-hdpi/mx_sport_archery.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_baseball.png b/OsmAnd/res/drawable-hdpi/mx_sport_baseball.png
index c5cb752df2..3c8881a79b 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_baseball.png and b/OsmAnd/res/drawable-hdpi/mx_sport_baseball.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_billiard.png b/OsmAnd/res/drawable-hdpi/mx_sport_billiard.png
index 5366483e5f..46dbac8de4 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_billiard.png and b/OsmAnd/res/drawable-hdpi/mx_sport_billiard.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_canoe.png b/OsmAnd/res/drawable-hdpi/mx_sport_canoe.png
index f70a839670..324ca4df32 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_canoe.png and b/OsmAnd/res/drawable-hdpi/mx_sport_canoe.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_diving.png b/OsmAnd/res/drawable-hdpi/mx_sport_diving.png
index f104b0cf81..591d1f8df5 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_diving.png and b/OsmAnd/res/drawable-hdpi/mx_sport_diving.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_golf.png b/OsmAnd/res/drawable-hdpi/mx_sport_golf.png
index ca543e0c3f..b0f2e9f36f 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_golf.png and b/OsmAnd/res/drawable-hdpi/mx_sport_golf.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_gymnastics.png b/OsmAnd/res/drawable-hdpi/mx_sport_gymnastics.png
index b31a0b6b3a..60e0e7f751 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_gymnastics.png and b/OsmAnd/res/drawable-hdpi/mx_sport_gymnastics.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_horse_racing.png b/OsmAnd/res/drawable-hdpi/mx_sport_horse_racing.png
index 5dd5d44a8f..1c212a68b7 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_horse_racing.png and b/OsmAnd/res/drawable-hdpi/mx_sport_horse_racing.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_shooting.png b/OsmAnd/res/drawable-hdpi/mx_sport_shooting.png
index 2072f29afa..0804a11e00 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_shooting.png and b/OsmAnd/res/drawable-hdpi/mx_sport_shooting.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_skating.png b/OsmAnd/res/drawable-hdpi/mx_sport_skating.png
index f3037d45c8..2ee22752ef 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_skating.png and b/OsmAnd/res/drawable-hdpi/mx_sport_skating.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_skiing.png b/OsmAnd/res/drawable-hdpi/mx_sport_skiing.png
index 603a5cdaf0..858c08b015 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_skiing.png and b/OsmAnd/res/drawable-hdpi/mx_sport_skiing.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_soccer.png b/OsmAnd/res/drawable-hdpi/mx_sport_soccer.png
index ab0828b2ef..9136cb00de 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_soccer.png and b/OsmAnd/res/drawable-hdpi/mx_sport_soccer.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_stadium.png b/OsmAnd/res/drawable-hdpi/mx_sport_stadium.png
index 80f069a600..e958014153 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_stadium.png and b/OsmAnd/res/drawable-hdpi/mx_sport_stadium.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_swimming.png b/OsmAnd/res/drawable-hdpi/mx_sport_swimming.png
index 35f25cfc57..6d259226c1 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_swimming.png and b/OsmAnd/res/drawable-hdpi/mx_sport_swimming.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_sport_tennis.png b/OsmAnd/res/drawable-hdpi/mx_sport_tennis.png
index 176842ab36..791f13b907 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_sport_tennis.png and b/OsmAnd/res/drawable-hdpi/mx_sport_tennis.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism.png b/OsmAnd/res/drawable-hdpi/mx_tourism.png
index 77011cfb24..2b8103846f 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism.png and b/OsmAnd/res/drawable-hdpi/mx_tourism.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_alpine_hut.png b/OsmAnd/res/drawable-hdpi/mx_tourism_alpine_hut.png
index f39dbbd02e..2d9bd4bf81 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_alpine_hut.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_alpine_hut.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_camp_site.png b/OsmAnd/res/drawable-hdpi/mx_tourism_camp_site.png
index 9bfa1330c9..052a79db10 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_camp_site.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_camp_site.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_caravan_site.png b/OsmAnd/res/drawable-hdpi/mx_tourism_caravan_site.png
index 2879803dee..d110dea256 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_caravan_site.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_caravan_site.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_chalet.png b/OsmAnd/res/drawable-hdpi/mx_tourism_chalet.png
index ea5dd57170..62bb6c7ace 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_chalet.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_chalet.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_guest_house.png b/OsmAnd/res/drawable-hdpi/mx_tourism_guest_house.png
index ed4aee9394..5932c13564 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_guest_house.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_guest_house.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_hostel.png b/OsmAnd/res/drawable-hdpi/mx_tourism_hostel.png
index 0b7937e05b..13be8b32db 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_hostel.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_hostel.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_hotel.png b/OsmAnd/res/drawable-hdpi/mx_tourism_hotel.png
index 27c4ef7c4d..133ded3a2f 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_hotel.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_hotel.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_information.png b/OsmAnd/res/drawable-hdpi/mx_tourism_information.png
index e069e66c3d..79a91a13fe 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_information.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_information.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_motel.png b/OsmAnd/res/drawable-hdpi/mx_tourism_motel.png
index b5671de5ca..b59b6924b4 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_motel.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_motel.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_museum.png b/OsmAnd/res/drawable-hdpi/mx_tourism_museum.png
index 77011cfb24..2b8103846f 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_museum.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_museum.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_picnic_site.png b/OsmAnd/res/drawable-hdpi/mx_tourism_picnic_site.png
index d367b7a79f..b2f3f1550b 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_picnic_site.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_picnic_site.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_theme_park.png b/OsmAnd/res/drawable-hdpi/mx_tourism_theme_park.png
index 18e8597aca..ef888d709d 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_theme_park.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_theme_park.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_viewpoint.png b/OsmAnd/res/drawable-hdpi/mx_tourism_viewpoint.png
index e39c66cc09..5edd160470 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_viewpoint.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_viewpoint.png differ
diff --git a/OsmAnd/res/drawable-hdpi/mx_tourism_zoo.png b/OsmAnd/res/drawable-hdpi/mx_tourism_zoo.png
index 3e83f4045a..d138ce90a0 100644
Binary files a/OsmAnd/res/drawable-hdpi/mx_tourism_zoo.png and b/OsmAnd/res/drawable-hdpi/mx_tourism_zoo.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_accomodation.png b/OsmAnd/res/drawable-mdpi/mx_accomodation.png
index 3682326424..7e04d72ac7 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_accomodation.png and b/OsmAnd/res/drawable-mdpi/mx_accomodation.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_arts_centre.png b/OsmAnd/res/drawable-mdpi/mx_amenity_arts_centre.png
index 5b84d371c3..0dae7218e2 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_arts_centre.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_arts_centre.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_casino.png b/OsmAnd/res/drawable-mdpi/mx_amenity_casino.png
index cf8819c796..667a187d70 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_casino.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_casino.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_cinema.png b/OsmAnd/res/drawable-mdpi/mx_amenity_cinema.png
index f19aa8e420..d65060d135 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_cinema.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_cinema.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_college.png b/OsmAnd/res/drawable-mdpi/mx_amenity_college.png
index f4f813c9ab..f909c837f6 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_college.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_college.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_kindergarten.png b/OsmAnd/res/drawable-mdpi/mx_amenity_kindergarten.png
index 7e9b4e9b2e..fb05586a39 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_kindergarten.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_kindergarten.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_school.png b/OsmAnd/res/drawable-mdpi/mx_amenity_school.png
index 3c42cc14d9..dc45f5fe19 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_school.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_school.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_shelter.png b/OsmAnd/res/drawable-mdpi/mx_amenity_shelter.png
index ed5ffbc537..390ac06a2c 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_shelter.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_shelter.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_theatre.png b/OsmAnd/res/drawable-mdpi/mx_amenity_theatre.png
index bc3a47968c..9cd5eb03e3 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_theatre.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_theatre.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_amenity_university.png b/OsmAnd/res/drawable-mdpi/mx_amenity_university.png
index 25872ea58d..c49808b0f1 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_amenity_university.png and b/OsmAnd/res/drawable-mdpi/mx_amenity_university.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_education.png b/OsmAnd/res/drawable-mdpi/mx_education.png
index 25872ea58d..c49808b0f1 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_education.png and b/OsmAnd/res/drawable-mdpi/mx_education.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_entertainment.png b/OsmAnd/res/drawable-mdpi/mx_entertainment.png
index f19aa8e420..d65060d135 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_entertainment.png and b/OsmAnd/res/drawable-mdpi/mx_entertainment.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_for_tourists.png b/OsmAnd/res/drawable-mdpi/mx_for_tourists.png
index aa1a897de5..d38c62bc38 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_for_tourists.png and b/OsmAnd/res/drawable-mdpi/mx_for_tourists.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic.png b/OsmAnd/res/drawable-mdpi/mx_historic.png
index d6cf6f118c..c4004af722 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic.png and b/OsmAnd/res/drawable-mdpi/mx_historic.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_archaeological_site.png b/OsmAnd/res/drawable-mdpi/mx_historic_archaeological_site.png
index d6cf6f118c..c4004af722 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_archaeological_site.png and b/OsmAnd/res/drawable-mdpi/mx_historic_archaeological_site.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_battlefield.png b/OsmAnd/res/drawable-mdpi/mx_historic_battlefield.png
index 937fdae126..ff853b5db2 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_battlefield.png and b/OsmAnd/res/drawable-mdpi/mx_historic_battlefield.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_castle.png b/OsmAnd/res/drawable-mdpi/mx_historic_castle.png
index 98e1b04770..8afc252201 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_castle.png and b/OsmAnd/res/drawable-mdpi/mx_historic_castle.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_fort.png b/OsmAnd/res/drawable-mdpi/mx_historic_fort.png
index 98e1b04770..8afc252201 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_fort.png and b/OsmAnd/res/drawable-mdpi/mx_historic_fort.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_memorial.png b/OsmAnd/res/drawable-mdpi/mx_historic_memorial.png
index e98148ddc4..ee908ea262 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_memorial.png and b/OsmAnd/res/drawable-mdpi/mx_historic_memorial.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_monument.png b/OsmAnd/res/drawable-mdpi/mx_historic_monument.png
index f13f370463..f9b6d0f28d 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_monument.png and b/OsmAnd/res/drawable-mdpi/mx_historic_monument.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_ruins.png b/OsmAnd/res/drawable-mdpi/mx_historic_ruins.png
index 71ee08ae78..be0f6d04d8 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_ruins.png and b/OsmAnd/res/drawable-mdpi/mx_historic_ruins.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_wayside_cross.png b/OsmAnd/res/drawable-mdpi/mx_historic_wayside_cross.png
index 256bf77157..7973cf3a9b 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_wayside_cross.png and b/OsmAnd/res/drawable-mdpi/mx_historic_wayside_cross.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_wayside_shrine.png b/OsmAnd/res/drawable-mdpi/mx_historic_wayside_shrine.png
index ebcb8136e2..d23faea945 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_wayside_shrine.png and b/OsmAnd/res/drawable-mdpi/mx_historic_wayside_shrine.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_historic_wreck.png b/OsmAnd/res/drawable-mdpi/mx_historic_wreck.png
index 83eb52aeb4..ce6fae319d 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_historic_wreck.png and b/OsmAnd/res/drawable-mdpi/mx_historic_wreck.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_leisure_ice_rink.png b/OsmAnd/res/drawable-mdpi/mx_leisure_ice_rink.png
index f6addcd414..b88fe4a2e9 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_leisure_ice_rink.png and b/OsmAnd/res/drawable-mdpi/mx_leisure_ice_rink.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_leisure_sports_centre.png b/OsmAnd/res/drawable-mdpi/mx_leisure_sports_centre.png
index 40b44052ee..0cf13daa72 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_leisure_sports_centre.png and b/OsmAnd/res/drawable-mdpi/mx_leisure_sports_centre.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_leisure_stadium.png b/OsmAnd/res/drawable-mdpi/mx_leisure_stadium.png
index a0193cde4a..17091cafc5 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_leisure_stadium.png and b/OsmAnd/res/drawable-mdpi/mx_leisure_stadium.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_leisure_water_park.png b/OsmAnd/res/drawable-mdpi/mx_leisure_water_park.png
index 2d0fbfcdbb..6af7998e33 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_leisure_water_park.png and b/OsmAnd/res/drawable-mdpi/mx_leisure_water_park.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_man_made_water_tower.png b/OsmAnd/res/drawable-mdpi/mx_man_made_water_tower.png
index 0412d4480b..d42463b904 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_man_made_water_tower.png and b/OsmAnd/res/drawable-mdpi/mx_man_made_water_tower.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_man_made_windmill.png b/OsmAnd/res/drawable-mdpi/mx_man_made_windmill.png
index 6f09290f17..46c780c922 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_man_made_windmill.png and b/OsmAnd/res/drawable-mdpi/mx_man_made_windmill.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_natural_beach.png b/OsmAnd/res/drawable-mdpi/mx_natural_beach.png
index 94fad1f976..6f01b6b98e 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_natural_beach.png and b/OsmAnd/res/drawable-mdpi/mx_natural_beach.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_railway_station.png b/OsmAnd/res/drawable-mdpi/mx_railway_station.png
index ac115ea7bc..84b5a303eb 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_railway_station.png and b/OsmAnd/res/drawable-mdpi/mx_railway_station.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sightseeing.png b/OsmAnd/res/drawable-mdpi/mx_sightseeing.png
index 98e1b04770..8afc252201 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sightseeing.png and b/OsmAnd/res/drawable-mdpi/mx_sightseeing.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport.png b/OsmAnd/res/drawable-mdpi/mx_sport.png
index 2d0fbfcdbb..6af7998e33 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport.png and b/OsmAnd/res/drawable-mdpi/mx_sport.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_archery.png b/OsmAnd/res/drawable-mdpi/mx_sport_archery.png
index d405b6699d..5a7691a6fe 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_archery.png and b/OsmAnd/res/drawable-mdpi/mx_sport_archery.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_baseball.png b/OsmAnd/res/drawable-mdpi/mx_sport_baseball.png
index 386601f048..a4daf3acb6 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_baseball.png and b/OsmAnd/res/drawable-mdpi/mx_sport_baseball.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_billiard.png b/OsmAnd/res/drawable-mdpi/mx_sport_billiard.png
index ae2b51f02e..bbb235d77e 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_billiard.png and b/OsmAnd/res/drawable-mdpi/mx_sport_billiard.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_canoe.png b/OsmAnd/res/drawable-mdpi/mx_sport_canoe.png
index 0476d71cb2..544f66d39c 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_canoe.png and b/OsmAnd/res/drawable-mdpi/mx_sport_canoe.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_diving.png b/OsmAnd/res/drawable-mdpi/mx_sport_diving.png
index 76afac51a4..c1a93058d0 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_diving.png and b/OsmAnd/res/drawable-mdpi/mx_sport_diving.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_golf.png b/OsmAnd/res/drawable-mdpi/mx_sport_golf.png
index 9159b4e368..0d0e44275e 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_golf.png and b/OsmAnd/res/drawable-mdpi/mx_sport_golf.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_gymnastics.png b/OsmAnd/res/drawable-mdpi/mx_sport_gymnastics.png
index cb5efee210..21d53acbfb 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_gymnastics.png and b/OsmAnd/res/drawable-mdpi/mx_sport_gymnastics.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_horse_racing.png b/OsmAnd/res/drawable-mdpi/mx_sport_horse_racing.png
index b96644c200..8abe25fb80 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_horse_racing.png and b/OsmAnd/res/drawable-mdpi/mx_sport_horse_racing.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_shooting.png b/OsmAnd/res/drawable-mdpi/mx_sport_shooting.png
index 7637a64918..35ebfca39a 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_shooting.png and b/OsmAnd/res/drawable-mdpi/mx_sport_shooting.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_skating.png b/OsmAnd/res/drawable-mdpi/mx_sport_skating.png
index f6addcd414..b88fe4a2e9 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_skating.png and b/OsmAnd/res/drawable-mdpi/mx_sport_skating.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_skiing.png b/OsmAnd/res/drawable-mdpi/mx_sport_skiing.png
index 5662ec41bf..11d4033c1e 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_skiing.png and b/OsmAnd/res/drawable-mdpi/mx_sport_skiing.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_soccer.png b/OsmAnd/res/drawable-mdpi/mx_sport_soccer.png
index 7b2db6abb4..10eba4fd22 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_soccer.png and b/OsmAnd/res/drawable-mdpi/mx_sport_soccer.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_stadium.png b/OsmAnd/res/drawable-mdpi/mx_sport_stadium.png
index a0193cde4a..17091cafc5 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_stadium.png and b/OsmAnd/res/drawable-mdpi/mx_sport_stadium.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_swimming.png b/OsmAnd/res/drawable-mdpi/mx_sport_swimming.png
index 2d0fbfcdbb..6af7998e33 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_swimming.png and b/OsmAnd/res/drawable-mdpi/mx_sport_swimming.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_sport_tennis.png b/OsmAnd/res/drawable-mdpi/mx_sport_tennis.png
index 9f5893ff3d..f1c8f54ebf 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_sport_tennis.png and b/OsmAnd/res/drawable-mdpi/mx_sport_tennis.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism.png b/OsmAnd/res/drawable-mdpi/mx_tourism.png
index 4c5566bc28..54340c6321 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism.png and b/OsmAnd/res/drawable-mdpi/mx_tourism.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_alpine_hut.png b/OsmAnd/res/drawable-mdpi/mx_tourism_alpine_hut.png
index 90cd963f45..291fe91a7a 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_alpine_hut.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_alpine_hut.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_camp_site.png b/OsmAnd/res/drawable-mdpi/mx_tourism_camp_site.png
index dcf668868b..3dee90ba60 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_camp_site.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_camp_site.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_caravan_site.png b/OsmAnd/res/drawable-mdpi/mx_tourism_caravan_site.png
index 6c9e46e9f6..ffc73a5ab4 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_caravan_site.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_caravan_site.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_chalet.png b/OsmAnd/res/drawable-mdpi/mx_tourism_chalet.png
index f132e97300..7ca3fa8f10 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_chalet.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_chalet.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_guest_house.png b/OsmAnd/res/drawable-mdpi/mx_tourism_guest_house.png
index 8614a5279b..98a25d153d 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_guest_house.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_guest_house.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_hostel.png b/OsmAnd/res/drawable-mdpi/mx_tourism_hostel.png
index 70d2362402..abd8f86eef 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_hostel.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_hostel.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_hotel.png b/OsmAnd/res/drawable-mdpi/mx_tourism_hotel.png
index 3682326424..7e04d72ac7 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_hotel.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_hotel.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_information.png b/OsmAnd/res/drawable-mdpi/mx_tourism_information.png
index decb788715..5b6d5b2b06 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_information.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_information.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_motel.png b/OsmAnd/res/drawable-mdpi/mx_tourism_motel.png
index 7cfc8fe7d9..0f2aa198e0 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_motel.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_motel.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_museum.png b/OsmAnd/res/drawable-mdpi/mx_tourism_museum.png
index 4c5566bc28..54340c6321 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_museum.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_museum.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_picnic_site.png b/OsmAnd/res/drawable-mdpi/mx_tourism_picnic_site.png
index e6995a5b48..7369645810 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_picnic_site.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_picnic_site.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_theme_park.png b/OsmAnd/res/drawable-mdpi/mx_tourism_theme_park.png
index dbca56cefe..9ea9692bdd 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_theme_park.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_theme_park.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_viewpoint.png b/OsmAnd/res/drawable-mdpi/mx_tourism_viewpoint.png
index aa1a897de5..d38c62bc38 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_viewpoint.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_viewpoint.png differ
diff --git a/OsmAnd/res/drawable-mdpi/mx_tourism_zoo.png b/OsmAnd/res/drawable-mdpi/mx_tourism_zoo.png
index f768aec0d1..6b610cd51e 100644
Binary files a/OsmAnd/res/drawable-mdpi/mx_tourism_zoo.png and b/OsmAnd/res/drawable-mdpi/mx_tourism_zoo.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_accomodation.png b/OsmAnd/res/drawable-xhdpi/mx_accomodation.png
index 24dfcb4ab1..98f58ce4d2 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_accomodation.png and b/OsmAnd/res/drawable-xhdpi/mx_accomodation.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_arts_centre.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_arts_centre.png
index 4dbb518d32..fd1dbbceb8 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_arts_centre.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_arts_centre.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_casino.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_casino.png
index 09dca28829..7267a80612 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_casino.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_casino.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_cinema.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_cinema.png
index acfc42619f..f7f49c0104 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_cinema.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_cinema.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_college.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_college.png
index 1fda995cba..93e926bbeb 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_college.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_college.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_kindergarten.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_kindergarten.png
index 0bfdf3ccd2..e0cdbde375 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_kindergarten.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_kindergarten.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_school.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_school.png
index 3f34e6d76a..f4be7e8671 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_school.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_school.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_shelter.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_shelter.png
index 19e71f8935..c22a14346c 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_shelter.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_shelter.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_theatre.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_theatre.png
index d441008626..fbd8f2e122 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_theatre.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_theatre.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_amenity_university.png b/OsmAnd/res/drawable-xhdpi/mx_amenity_university.png
index ba02c2778c..19c604cf4a 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_amenity_university.png and b/OsmAnd/res/drawable-xhdpi/mx_amenity_university.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_education.png b/OsmAnd/res/drawable-xhdpi/mx_education.png
index ba02c2778c..19c604cf4a 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_education.png and b/OsmAnd/res/drawable-xhdpi/mx_education.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_entertainment.png b/OsmAnd/res/drawable-xhdpi/mx_entertainment.png
index acfc42619f..f7f49c0104 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_entertainment.png and b/OsmAnd/res/drawable-xhdpi/mx_entertainment.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_for_tourists.png b/OsmAnd/res/drawable-xhdpi/mx_for_tourists.png
index a16fd5b52d..9b02a05c82 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_for_tourists.png and b/OsmAnd/res/drawable-xhdpi/mx_for_tourists.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic.png b/OsmAnd/res/drawable-xhdpi/mx_historic.png
index 87ff4c7769..ad24a06c65 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic.png and b/OsmAnd/res/drawable-xhdpi/mx_historic.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_archaeological_site.png b/OsmAnd/res/drawable-xhdpi/mx_historic_archaeological_site.png
index 87ff4c7769..ad24a06c65 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_archaeological_site.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_archaeological_site.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_battlefield.png b/OsmAnd/res/drawable-xhdpi/mx_historic_battlefield.png
index e8990011b2..287f622b54 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_battlefield.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_battlefield.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_castle.png b/OsmAnd/res/drawable-xhdpi/mx_historic_castle.png
index be66a8b641..45e7d4ec15 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_castle.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_castle.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_fort.png b/OsmAnd/res/drawable-xhdpi/mx_historic_fort.png
index be66a8b641..45e7d4ec15 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_fort.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_fort.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_memorial.png b/OsmAnd/res/drawable-xhdpi/mx_historic_memorial.png
index 6b6ee5d93c..ebdb1eb9d2 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_memorial.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_memorial.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_monument.png b/OsmAnd/res/drawable-xhdpi/mx_historic_monument.png
index 12181c1594..fcaecda201 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_monument.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_monument.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_ruins.png b/OsmAnd/res/drawable-xhdpi/mx_historic_ruins.png
index 2e5223196a..5ba315d9e4 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_ruins.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_ruins.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_cross.png b/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_cross.png
index b8fec27260..d9a3fe1a91 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_cross.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_cross.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_shrine.png b/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_shrine.png
index 048f671460..15cef7106d 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_shrine.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_wayside_shrine.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_historic_wreck.png b/OsmAnd/res/drawable-xhdpi/mx_historic_wreck.png
index 82da3d32a0..48e0863065 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_historic_wreck.png and b/OsmAnd/res/drawable-xhdpi/mx_historic_wreck.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_leisure_ice_rink.png b/OsmAnd/res/drawable-xhdpi/mx_leisure_ice_rink.png
index 479fa32f65..7146551cef 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_leisure_ice_rink.png and b/OsmAnd/res/drawable-xhdpi/mx_leisure_ice_rink.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_leisure_sports_centre.png b/OsmAnd/res/drawable-xhdpi/mx_leisure_sports_centre.png
index dab36335ce..a8e6a810de 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_leisure_sports_centre.png and b/OsmAnd/res/drawable-xhdpi/mx_leisure_sports_centre.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_leisure_stadium.png b/OsmAnd/res/drawable-xhdpi/mx_leisure_stadium.png
index 67ab6f270a..3ba4caccab 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_leisure_stadium.png and b/OsmAnd/res/drawable-xhdpi/mx_leisure_stadium.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_leisure_water_park.png b/OsmAnd/res/drawable-xhdpi/mx_leisure_water_park.png
index 7f0d8a5eba..c7600ed534 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_leisure_water_park.png and b/OsmAnd/res/drawable-xhdpi/mx_leisure_water_park.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_man_made_water_tower.png b/OsmAnd/res/drawable-xhdpi/mx_man_made_water_tower.png
index d137ee032e..f2b726b1b9 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_man_made_water_tower.png and b/OsmAnd/res/drawable-xhdpi/mx_man_made_water_tower.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_man_made_windmill.png b/OsmAnd/res/drawable-xhdpi/mx_man_made_windmill.png
index 2d69d47a5e..899a3a0580 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_man_made_windmill.png and b/OsmAnd/res/drawable-xhdpi/mx_man_made_windmill.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_natural_beach.png b/OsmAnd/res/drawable-xhdpi/mx_natural_beach.png
index 9ee666e996..fb0c1067a0 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_natural_beach.png and b/OsmAnd/res/drawable-xhdpi/mx_natural_beach.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_railway_station.png b/OsmAnd/res/drawable-xhdpi/mx_railway_station.png
index d1a1a675cd..7ad47cf5f6 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_railway_station.png and b/OsmAnd/res/drawable-xhdpi/mx_railway_station.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sightseeing.png b/OsmAnd/res/drawable-xhdpi/mx_sightseeing.png
index be66a8b641..45e7d4ec15 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sightseeing.png and b/OsmAnd/res/drawable-xhdpi/mx_sightseeing.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport.png b/OsmAnd/res/drawable-xhdpi/mx_sport.png
index 7f0d8a5eba..c7600ed534 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport.png and b/OsmAnd/res/drawable-xhdpi/mx_sport.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_archery.png b/OsmAnd/res/drawable-xhdpi/mx_sport_archery.png
index 8878bd26d6..fa71094136 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_archery.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_archery.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_baseball.png b/OsmAnd/res/drawable-xhdpi/mx_sport_baseball.png
index 7e2384c736..cd3deb8715 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_baseball.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_baseball.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_billiard.png b/OsmAnd/res/drawable-xhdpi/mx_sport_billiard.png
index fbaab74353..0dd4496de1 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_billiard.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_billiard.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_canoe.png b/OsmAnd/res/drawable-xhdpi/mx_sport_canoe.png
index e48a05ebbc..0250b86a7e 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_canoe.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_canoe.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_diving.png b/OsmAnd/res/drawable-xhdpi/mx_sport_diving.png
index ffea48dfd3..372034bd66 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_diving.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_diving.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_golf.png b/OsmAnd/res/drawable-xhdpi/mx_sport_golf.png
index ea61c82101..4d4a82de57 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_golf.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_golf.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_gymnastics.png b/OsmAnd/res/drawable-xhdpi/mx_sport_gymnastics.png
index decebbd24f..ca2bf0c329 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_gymnastics.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_gymnastics.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_horse_racing.png b/OsmAnd/res/drawable-xhdpi/mx_sport_horse_racing.png
index 668eb284d2..e8ffdf13e2 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_horse_racing.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_horse_racing.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_shooting.png b/OsmAnd/res/drawable-xhdpi/mx_sport_shooting.png
index 0bb0d41d96..a92371416f 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_shooting.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_shooting.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_skating.png b/OsmAnd/res/drawable-xhdpi/mx_sport_skating.png
index 479fa32f65..7146551cef 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_skating.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_skating.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_skiing.png b/OsmAnd/res/drawable-xhdpi/mx_sport_skiing.png
index 0624314dbe..4edad57ed4 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_skiing.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_skiing.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_soccer.png b/OsmAnd/res/drawable-xhdpi/mx_sport_soccer.png
index 9de63a0a38..f5b14cab52 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_soccer.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_soccer.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_stadium.png b/OsmAnd/res/drawable-xhdpi/mx_sport_stadium.png
index 67ab6f270a..3ba4caccab 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_stadium.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_stadium.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_swimming.png b/OsmAnd/res/drawable-xhdpi/mx_sport_swimming.png
index 7f0d8a5eba..c7600ed534 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_swimming.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_swimming.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_sport_tennis.png b/OsmAnd/res/drawable-xhdpi/mx_sport_tennis.png
index 82ff4271b3..2b86cf3d91 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_sport_tennis.png and b/OsmAnd/res/drawable-xhdpi/mx_sport_tennis.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism.png b/OsmAnd/res/drawable-xhdpi/mx_tourism.png
index a24df946c2..80f42c1d34 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_alpine_hut.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_alpine_hut.png
index 38f777888f..390fa40a3a 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_alpine_hut.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_alpine_hut.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_camp_site.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_camp_site.png
index 067dd99982..1c80dc4e83 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_camp_site.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_camp_site.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_caravan_site.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_caravan_site.png
index 06adea01d1..bea301647b 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_caravan_site.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_caravan_site.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_chalet.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_chalet.png
index 3397a2dc08..f90f92c5db 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_chalet.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_chalet.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_guest_house.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_guest_house.png
index 24421c08c8..8ba91f2dff 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_guest_house.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_guest_house.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_hostel.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_hostel.png
index 231a5c6caf..34e9d5cbdd 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_hostel.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_hostel.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_hotel.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_hotel.png
index 24dfcb4ab1..98f58ce4d2 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_hotel.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_hotel.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_information.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_information.png
index c5fc57e576..f25509a166 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_information.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_information.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_motel.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_motel.png
index f27e0a5963..dc20eddecb 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_motel.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_motel.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_museum.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_museum.png
index a24df946c2..80f42c1d34 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_museum.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_museum.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_picnic_site.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_picnic_site.png
index e84fe58bb5..6e749806d8 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_picnic_site.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_picnic_site.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_theme_park.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_theme_park.png
index a1d09399a0..9b260fa4f0 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_theme_park.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_theme_park.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_viewpoint.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_viewpoint.png
index a16fd5b52d..9b02a05c82 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_viewpoint.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_viewpoint.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/mx_tourism_zoo.png b/OsmAnd/res/drawable-xhdpi/mx_tourism_zoo.png
index 087fdee4e9..f5afff4722 100644
Binary files a/OsmAnd/res/drawable-xhdpi/mx_tourism_zoo.png and b/OsmAnd/res/drawable-xhdpi/mx_tourism_zoo.png differ
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 856057efc2..ef5530d660 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="route_updated_loc_found">Roete sal herbereken word wanneer die ligging bepaal is</string>
   <string name="osmand_parking_hours">Ure</string>
   <string name="osmand_parking_minutes">Minute</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index d81712ed94..01b181f2e3 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy.</string>
   <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 56e889ff4d..10c6827682 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
     <string name="av_def_action_video">Optag video</string>
     <string name="av_def_action_audio">Optag audio</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 00eb5c4086..bd9439269e 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="local_index_gpx_timespan">\nZeitspanne: %1$d:%2$02d:%3$02d</string>
 	<string name="local_index_gpx_timemoving">\nZeit in Bewegung: %1$d:%2$02d:%3$02d</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 83c536e014..e2e3ee723e 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="btn_add_tag">Προσθήκη Ετικέτας</string>
     <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
     <string name="poi_filter_parking">Στάθμευση</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index ff403a6ab1..4b5a28b58b 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="live_monitoring_mode_off">Iniciar\n seguimiento en directo</string>
   <string name="live_monitoring_mode_on">Parar\n seguimiento en directo</string>
   <string name="layer_map_appearance">Configura pantalla</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 2949837267..c8b961091c 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="local_osm_changes_backup_failed">پشتیبان گیری از تغییرات OSM ناموفق بود</string>
     <string name="plugin_distance_point_time">زمان</string>
     <string name="plugin_distance_point_hdop">دقت</string>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 4dbfdbef27..403bf1ef50 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="map_widget_gps_info">GPS informacije</string>
     <string name="access_arrival_time">Vrijeme dolaska</string>
     <string name="item_checked">provjereno</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 7256e44e40..8ea4d68afc 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
 \n\t- Natív renderelő minden eszközre
 \n\t- Offline POI szerkesztés
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 99cbeb0d80..c752a19173 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
   <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
   <string name="offline_edition">Modifiche offline</string>
@@ -1323,8 +1323,8 @@
 	<string name="tip_recent_changes_1_5_t">Cambiamenti nella 1.5:↵
 →\n\t* Avvisi vocali per autovelox e limiti di velocità↵
 →\n\t* Icone mappe ad alta densità↵
-→\n\t* Molti camimenti dell'interfaccia grafica↵
-→\n\t* Correzione di errori nella visualizzazione della distanza, l'analizzatore GPX, utilizzo punti di passaggio, widget di pianificazione, upload OSM, utilizzo https↵
+→\n\t* Molti camimenti dell\'interfaccia grafica↵
+→\n\t* Correzione di errori nella visualizzazione della distanza, l\'analizzatore GPX, utilizzo punti di passaggio, widget di pianificazione, upload OSM, utilizzo https↵
     </string>
     <string name="osb_author_or_password_not_specified">Prego specificare il nome utente OSM e la password nelle Impostazioni</string>
     <string name="clear_intermediate_points">Cancella i punti intermedi</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 0b3bbb1e12..2b04a8bdd5 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="live_monitoring_mode_off">Start\n online tracking</string>
   <string name="live_monitoring_mode_on">Stop\n online tracking</string>
   <string name="layer_map_appearance">Configureer scherm</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index ee5091915e..d87559ded3 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_select_destination_point">Uzyskiwanie informacji o trasie</string>
   <string name="tip_select_destination_point_t">"\tTrasę przejazdu do wybranego punktu możesz zobaczyć bezpośrednio na mapie (menu kontekstowe, następnie \'Trasa\'), podczas wyszukiwania lub po długim naciśnięciu na wpis z listy ulubionych punktów.
 \n\tPunkt docelowy oznaczony jest pomarańczową flagą na mapie. OsmAnd wyświetla odległość i kierunek do niej (pomarańczowy trójkąt). "</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index a7000698f9..a43a138dea 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="search_button">Išči</string>
 	<string name="search_activity">Išči</string>
 	<string name="settings_Button">Nastavitve</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index b37e1bd31a..7f9ba7656c 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
 <string name="ChooseCountry">Välj land</string>
 <string name="choose_city">Välj stad</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 1c4bd6e2be..5165525922 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
 		\n\t* Більш точні маршрути (трохи повільніше)
 		\n\t* Розумний і швидкий перерахунок маршруту
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 41e69cb5a1..673c1991b6 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
 	<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
     <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 4305545097..95cffcdaba 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -706,8 +706,8 @@ public class MapActivityActions implements DialogProvider {
 				android.R.layout.simple_spinner_item, 
 				fromActions
 				);
+		fromAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		fromSpinner.setAdapter(fromAdapter);
-		fromSpinner.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		if(style.routeFromMapPoint && mapView != null) {
 			fromSpinner.setSelection(1);
 		}
diff --git a/SherlockBar/.classpath b/SherlockBar/.classpath
index a4763d1eec..7bc01d9a9c 100644
--- a/SherlockBar/.classpath
+++ b/SherlockBar/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/plugins/OsmAnd-AddressPlugin/.classpath b/plugins/OsmAnd-AddressPlugin/.classpath
index a4763d1eec..7bc01d9a9c 100644
--- a/plugins/OsmAnd-AddressPlugin/.classpath
+++ b/plugins/OsmAnd-AddressPlugin/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/plugins/Osmand-ParkingPlugin/.classpath b/plugins/Osmand-ParkingPlugin/.classpath
index a4763d1eec..7bc01d9a9c 100644
--- a/plugins/Osmand-ParkingPlugin/.classpath
+++ b/plugins/Osmand-ParkingPlugin/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/plugins/Osmand-SRTMPlugin/.classpath b/plugins/Osmand-SRTMPlugin/.classpath
index a4763d1eec..7bc01d9a9c 100644
--- a/plugins/Osmand-SRTMPlugin/.classpath
+++ b/plugins/Osmand-SRTMPlugin/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>