diff --git a/OsmAnd/res/drawable/back_location.png b/OsmAnd/res/drawable/back_location.png
new file mode 100644
index 0000000000..3796497d06
Binary files /dev/null and b/OsmAnd/res/drawable/back_location.png differ
diff --git a/OsmAnd/res/drawable/back_menu.png b/OsmAnd/res/drawable/back_menu.png
new file mode 100644
index 0000000000..6fbe6fba5a
Binary files /dev/null and b/OsmAnd/res/drawable/back_menu.png differ
diff --git a/OsmAnd/res/drawable/reset.png b/OsmAnd/res/drawable/reset.png
new file mode 100644
index 0000000000..1cdfd3f2a0
Binary files /dev/null and b/OsmAnd/res/drawable/reset.png differ
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 0fae651b40..488a6351c6 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -7,8 +7,8 @@
 
 <ZoomControls android:id="@+id/ZoomControls01"
 		android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|right"></ZoomControls>		
-<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:id="@+id/BackToMenu" android:background="@drawable/back"></ImageButton>
-<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|right" android:id="@+id/BackToLocation" android:background="@drawable/icon"></ImageButton>
+<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>
 
 
 </FrameLayout>
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 734a1b388e..f7f6441873 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -15,7 +15,7 @@
 </TextView>
 <Button android:id="@+id/CountryButton" android:text="@string/ChooseCountry">
 </Button>
-<ImageButton android:id="@+id/ResetCountry" android:background="@drawable/icon"  android:layout_marginRight = "5dp">
+<ImageButton android:id="@+id/ResetCountry" android:layout_marginRight = "5dp" android:background="@drawable/reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp" >
@@ -23,7 +23,7 @@
 </TextView>
 <Button android:id="@+id/CityButton" android:text="@string/choose_city">
 </Button>
-<ImageButton android:id="@+id/ResetCity" android:background="@drawable/icon"  android:layout_marginRight = "5dp">
+<ImageButton android:id="@+id/ResetCity" android:layout_marginRight = "5dp" android:background="@drawable/reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
@@ -31,7 +31,7 @@
 </TextView>
 <Button android:id="@+id/StreetButton" android:text="@string/choose_street">
 </Button>
-<ImageButton android:id="@+id/ResetStreet" android:background="@drawable/icon"  android:layout_marginRight = "5dp">
+<ImageButton android:id="@+id/ResetStreet" android:layout_marginRight = "5dp" android:background="@drawable/reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
@@ -39,7 +39,7 @@
 </TextView>
 <Button android:id="@+id/BuildingButton" android:text="@string/choose_building">
 </Button>
-<ImageButton android:id="@+id/ResetBuilding" android:background="@drawable/icon" android:layout_marginRight = "5dp">
+<ImageButton android:id="@+id/ResetBuilding" android:layout_marginRight = "5dp" android:background="@drawable/reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp" >
diff --git a/OsmAnd/src/com/osmand/activities/MapActivity.java b/OsmAnd/src/com/osmand/activities/MapActivity.java
index f1d53f2645..1f50312c13 100644
--- a/OsmAnd/src/com/osmand/activities/MapActivity.java
+++ b/OsmAnd/src/com/osmand/activities/MapActivity.java
@@ -133,7 +133,7 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
 		backToLocation.setOnClickListener(new OnClickListener(){
 			@Override
 			public void onClick(View v) {
-				backToLocation.setVisibility(View.INVISIBLE);
+				backToLocation.setVisibility(View.VISIBLE);
 				if(!isMapLinkedToLocation()){
 					getPreferences(MODE_WORLD_READABLE).edit().putBoolean(BACK_TO_LOCATION, true).commit();
 					if(locationLayer.getLastKnownLocation() != null){
@@ -213,8 +213,8 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
 				}
 			}
 		} else {
-			if(backToLocation.getVisibility() != View.INVISIBLE){
-				backToLocation.setVisibility(View.INVISIBLE);
+			if(backToLocation.getVisibility() != View.VISIBLE){
+				backToLocation.setVisibility(View.VISIBLE);
 			}
 		}
     }