diff --git a/DataExtractionOSM/src/com/osmand/ToDoConstants.java b/DataExtractionOSM/src/com/osmand/ToDoConstants.java
index f48a50de18..b6df3f49b1 100644
--- a/DataExtractionOSM/src/com/osmand/ToDoConstants.java
+++ b/DataExtractionOSM/src/com/osmand/ToDoConstants.java
@@ -12,10 +12,15 @@ public class ToDoConstants {
 	//  ! 81. Add some objects to POI category (1) to add them into OSM 2) to help navigation)
 	//  highway (?), traffic_calming (?), barrier(?), military(?-), landuse (?), office(?), man_made(?), power(?),
 	//  railway( station, subway?) - issue 17
+	//    82. Rotate map according compass
 
 	
 	// TODO BUGS Android
-	// ! 3. different screens better support
+	// !! 3. different screens better support
+	///   3.1 after search_address_online.xml (+)
+	//    3.2 Fix all layers, route_info_list_item.xml, main.xml
+	//    3.3 Fix map zoom by default map (in 1.5 for high density)
+	//    4. Icon back to location
 	
 	// Improvements
 	// ! Download with wget
@@ -38,7 +43,7 @@ public class ToDoConstants {
 	// TODO swing
 	// 9. Fix issues with big files (such as netherlands) - save memory (!) - very slow due to transport index !
 	// Current result : for big file (1 - task  60-80% time, 90% memory) (?)
- 	// ! 10. Improve address indexing (use relations). (?) // SLOBODSKAYA 157, 95
+ 	// !! 10. Improve address indexing (use relations). (?) // SLOBODSKAYA 157, 95
     //	  use relation "a6" (to accumulate streets!),  "a3" to read all cities & define boundaries for city (& define that street in city). 
 	
 	// BUGS Swing
diff --git a/DataExtractionOSM/src/com/osmand/Version.java b/DataExtractionOSM/src/com/osmand/Version.java
index cc4e1ea0ea..3b1f14ef62 100644
--- a/DataExtractionOSM/src/com/osmand/Version.java
+++ b/DataExtractionOSM/src/com/osmand/Version.java
@@ -2,7 +2,7 @@ package com.osmand;
 
 public class Version {
 	
-	public static final String APP_VERSION = "0.3.2"; //$NON-NLS-1$
+	public static final String APP_VERSION = "0.3.3"; //$NON-NLS-1$
 	public static final String APP_NAME = "OsmAnd"; //$NON-NLS-1$
 	
 	public static final String APP_NAME_VERSION = APP_NAME + " " + APP_VERSION; //$NON-NLS-1$
diff --git a/OsmAnd/res/drawable/back_location.png b/OsmAnd/res/drawable/back_location.png
index 3796497d06..995586704c 100644
Binary files a/OsmAnd/res/drawable/back_location.png and b/OsmAnd/res/drawable/back_location.png differ
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 89e724b6cb..87041a31a8 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -8,7 +8,7 @@
 		android:layout_width="100dp" android:layout_height="wrap_content" android:layout_gravity="bottom|right"/>
 
 <ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:id="@+id/BackToMenu" android:background="@drawable/back_menu"></ImageButton>
-<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|right" android:id="@+id/BackToLocation" android:background="@drawable/back_location"></ImageButton>
+<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|right" android:layout_marginTop="64dp" android:id="@+id/BackToLocation" android:background="@drawable/back_location"></ImageButton>
 
 <LinearLayout android:layout_width="wrap_content" android:id="@+id/RouteLayout" android:orientation="horizontal" android:layout_height="wrap_content" android:layout_gravity="bottom|center" android:layout_marginBottom="12dp" >
 <Button android:layout_width="wrap_content" android:id="@+id/PreviousButton" android:layout_height="wrap_content" android:background="@android:drawable/ic_media_previous"/>