diff --git a/OsmAnd/res/drawable-hdpi/button_icon_favorites.png b/OsmAnd/res/drawable-hdpi/button_icon_favorites.png
index f28065c799..9fd4fac455 100644
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_favorites.png and b/OsmAnd/res/drawable-hdpi/button_icon_favorites.png differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_map.png b/OsmAnd/res/drawable-hdpi/button_icon_map.png
index 8d78680c69..46eb178248 100644
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_map.png and b/OsmAnd/res/drawable-hdpi/button_icon_map.png differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_search.png b/OsmAnd/res/drawable-hdpi/button_icon_search.png
index 2d3fb29aa4..0540e08887 100644
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_search.png and b/OsmAnd/res/drawable-hdpi/button_icon_search.png differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_settings.png b/OsmAnd/res/drawable-hdpi/button_icon_settings.png
index 30a2f885c9..108847df6e 100644
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_settings.png and b/OsmAnd/res/drawable-hdpi/button_icon_settings.png differ
diff --git a/OsmAnd/res/drawable-land-hdpi/button_icon_favorites.png b/OsmAnd/res/drawable-land-hdpi/button_icon_favorites.png
index ef90d0959e..7a8ca9062e 100644
Binary files a/OsmAnd/res/drawable-land-hdpi/button_icon_favorites.png and b/OsmAnd/res/drawable-land-hdpi/button_icon_favorites.png differ
diff --git a/OsmAnd/res/drawable-land-hdpi/button_icon_map.png b/OsmAnd/res/drawable-land-hdpi/button_icon_map.png
index a7cdde8d7f..c47a704c51 100644
Binary files a/OsmAnd/res/drawable-land-hdpi/button_icon_map.png and b/OsmAnd/res/drawable-land-hdpi/button_icon_map.png differ
diff --git a/OsmAnd/res/drawable-land-hdpi/button_icon_search.png b/OsmAnd/res/drawable-land-hdpi/button_icon_search.png
index fb67aa748e..8c61aeacff 100644
Binary files a/OsmAnd/res/drawable-land-hdpi/button_icon_search.png and b/OsmAnd/res/drawable-land-hdpi/button_icon_search.png differ
diff --git a/OsmAnd/res/drawable-land-hdpi/button_icon_settings.png b/OsmAnd/res/drawable-land-hdpi/button_icon_settings.png
index 6c93e8090b..7340e1c683 100644
Binary files a/OsmAnd/res/drawable-land-hdpi/button_icon_settings.png and b/OsmAnd/res/drawable-land-hdpi/button_icon_settings.png differ
diff --git a/OsmAnd/res/drawable-land/button_icon_favorites.png b/OsmAnd/res/drawable-land/button_icon_favorites.png
deleted file mode 100644
index a0da66a9d9..0000000000
Binary files a/OsmAnd/res/drawable-land/button_icon_favorites.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-land/button_icon_map.png b/OsmAnd/res/drawable-land/button_icon_map.png
deleted file mode 100644
index 18a20260b6..0000000000
Binary files a/OsmAnd/res/drawable-land/button_icon_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-land/button_icon_search.png b/OsmAnd/res/drawable-land/button_icon_search.png
deleted file mode 100644
index ce80cf6ad5..0000000000
Binary files a/OsmAnd/res/drawable-land/button_icon_search.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-land/button_icon_settings.png b/OsmAnd/res/drawable-land/button_icon_settings.png
deleted file mode 100644
index 598c2daab4..0000000000
Binary files a/OsmAnd/res/drawable-land/button_icon_settings.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-large-land/button_icon_favorites.png b/OsmAnd/res/drawable-large-land/button_icon_favorites.png
index ef90d0959e..7a8ca9062e 100644
Binary files a/OsmAnd/res/drawable-large-land/button_icon_favorites.png and b/OsmAnd/res/drawable-large-land/button_icon_favorites.png differ
diff --git a/OsmAnd/res/drawable-large-land/button_icon_map.png b/OsmAnd/res/drawable-large-land/button_icon_map.png
index a7cdde8d7f..c47a704c51 100644
Binary files a/OsmAnd/res/drawable-large-land/button_icon_map.png and b/OsmAnd/res/drawable-large-land/button_icon_map.png differ
diff --git a/OsmAnd/res/drawable-large-land/button_icon_search.png b/OsmAnd/res/drawable-large-land/button_icon_search.png
index fb67aa748e..8c61aeacff 100644
Binary files a/OsmAnd/res/drawable-large-land/button_icon_search.png and b/OsmAnd/res/drawable-large-land/button_icon_search.png differ
diff --git a/OsmAnd/res/drawable-large-land/button_icon_settings.png b/OsmAnd/res/drawable-large-land/button_icon_settings.png
index 6c93e8090b..7340e1c683 100644
Binary files a/OsmAnd/res/drawable-large-land/button_icon_settings.png and b/OsmAnd/res/drawable-large-land/button_icon_settings.png differ
diff --git a/OsmAnd/res/drawable-large/button_icon_favorites.png b/OsmAnd/res/drawable-large/button_icon_favorites.png
index f28065c799..9fd4fac455 100644
Binary files a/OsmAnd/res/drawable-large/button_icon_favorites.png and b/OsmAnd/res/drawable-large/button_icon_favorites.png differ
diff --git a/OsmAnd/res/drawable-large/button_icon_map.png b/OsmAnd/res/drawable-large/button_icon_map.png
index 8d78680c69..46eb178248 100644
Binary files a/OsmAnd/res/drawable-large/button_icon_map.png and b/OsmAnd/res/drawable-large/button_icon_map.png differ
diff --git a/OsmAnd/res/drawable-large/button_icon_search.png b/OsmAnd/res/drawable-large/button_icon_search.png
index 2d3fb29aa4..0540e08887 100644
Binary files a/OsmAnd/res/drawable-large/button_icon_search.png and b/OsmAnd/res/drawable-large/button_icon_search.png differ
diff --git a/OsmAnd/res/drawable-large/button_icon_settings.png b/OsmAnd/res/drawable-large/button_icon_settings.png
index 30a2f885c9..108847df6e 100644
Binary files a/OsmAnd/res/drawable-large/button_icon_settings.png and b/OsmAnd/res/drawable-large/button_icon_settings.png differ
diff --git a/OsmAnd/res/drawable/button_icon_favorites.png b/OsmAnd/res/drawable/button_icon_favorites.png
index bb88283ad8..7a8ca9062e 100644
Binary files a/OsmAnd/res/drawable/button_icon_favorites.png and b/OsmAnd/res/drawable/button_icon_favorites.png differ
diff --git a/OsmAnd/res/drawable/button_icon_map.png b/OsmAnd/res/drawable/button_icon_map.png
index 9c44541485..c47a704c51 100644
Binary files a/OsmAnd/res/drawable/button_icon_map.png and b/OsmAnd/res/drawable/button_icon_map.png differ
diff --git a/OsmAnd/res/drawable/button_icon_search.png b/OsmAnd/res/drawable/button_icon_search.png
index f901d538c8..8c61aeacff 100644
Binary files a/OsmAnd/res/drawable/button_icon_search.png and b/OsmAnd/res/drawable/button_icon_search.png differ
diff --git a/OsmAnd/res/drawable/button_icon_settings.png b/OsmAnd/res/drawable/button_icon_settings.png
index bd3e3a9ece..7340e1c683 100644
Binary files a/OsmAnd/res/drawable/button_icon_settings.png and b/OsmAnd/res/drawable/button_icon_settings.png differ
diff --git a/OsmAnd/res/layout-land/menu.xml b/OsmAnd/res/layout-land/menu.xml
index 3add6fbb45..ea3c9b1018 100644
--- a/OsmAnd/res/layout-land/menu.xml
+++ b/OsmAnd/res/layout-land/menu.xml
@@ -12,10 +12,10 @@
   		<ImageView android:src="@drawable/headline_osmand_icon"  
   					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
   		<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"  android:id="@+id/AppName" 
-  				  android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp" 
+  				  android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="3dp" 
 				  android:text="OsmAnd+" android:textColor="#000000"	android:typeface="serif" android:textSize="20sp"/>
 		<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
-				  android:layout_marginTop="5dp"
+				  android:layout_marginTop="3dp"
 				  android:text="0.5.1 beta(b6)" android:textColor="#000000"	android:typeface="serif" android:id="@+id/TextVersion"
 				  android:textSize="13sp"/> 
 		<ImageView android:src="@drawable/headliner_close"  android:layout_marginRight="10dp" android:id="@+id/CloseButton"
@@ -31,14 +31,13 @@
 	 			<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_gravity="center_vertical" 
 					android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
-				    android:text="@string/map_Button" android:textColor="#000000"
+				    android:text="@string/map_Button" android:textColor="#000000" android:typeface="serif"
 				    android:layout_weight="1"
 				  	android:textSize="16sp"/>	
 	 			<ImageView
 					android:src="@drawable/button_icon_map"
-					android:scaleType="center" 
-					android:layout_gravity="top|right"
-					android:layout_marginRight="30dp"
+					android:layout_gravity="center|right"
+					android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 				
@@ -48,10 +47,9 @@
 						android:layout_width="240dp" android:layout_height="121dp">
 					<ImageView
 					android:src="@drawable/button_icon_search"
-					android:scaleType="center" 
-					android:layout_gravity="top|left"
+					android:layout_gravity="center|left"
 					android:layout_width="wrap_content"
-					android:layout_marginLeft="35dp"
+					android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
 					android:layout_height="wrap_content"/>
 					
 					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
@@ -59,7 +57,7 @@
 					android:layout_weight="1"
 					android:layout_marginLeft="5dp"
 					android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
-				    android:text="@string/search_button"  android:textColor="#000000"
+				    android:text="@string/search_button"  android:textColor="#000000" android:typeface="serif"
 				  	android:textSize="16sp"/>	
 			</LinearLayout>
 		</TableRow>
@@ -69,14 +67,13 @@
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
 					android:layout_gravity="center_vertical|left"
-				    android:text="@string/favorites_Button"  android:textColor="#000000"
+				    android:text="@string/favorites_Button"  android:textColor="#000000" android:typeface="serif"
 				    android:layout_weight="1"
 				  	android:textSize="16sp"/>
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites"
-					android:scaleType="center" 
-					android:layout_gravity="top|right"
-					android:layout_marginRight="30dp"
+					android:layout_gravity="center|right"
+					android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 	 		</LinearLayout>
@@ -85,9 +82,8 @@
 					android:layout_width="240dp" android:layout_height="121dp">
 					<ImageView
 					android:src="@drawable/button_icon_settings"
-					android:scaleType="center" 
-					android:layout_gravity="top|left"
-					android:layout_marginLeft="35dp"
+					android:layout_gravity="center|left"
+					android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 					
@@ -96,7 +92,7 @@
 					android:layout_weight="1"
 					android:layout_marginLeft="5dp"
 					android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
-				    android:text="@string/settings_Button"  android:textColor="#000000"
+				    android:text="@string/settings_Button"  android:textColor="#000000" android:typeface="serif"
 				  	android:textSize="16sp"/>	
 			</LinearLayout>
 			</TableRow>
diff --git a/OsmAnd/res/layout-large-land/menu.xml b/OsmAnd/res/layout-large-land/menu.xml
index 23063a2903..3f793be751 100644
--- a/OsmAnd/res/layout-large-land/menu.xml
+++ b/OsmAnd/res/layout-large-land/menu.xml
@@ -37,8 +37,8 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_map"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
-					android:layout_marginRight="45dp"
+					android:layout_gravity="center|right"
+					android:layout_marginRight="67dp" android:layout_marginBottom="7dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 				
@@ -49,9 +49,9 @@
 					<ImageView
 					android:src="@drawable/button_icon_search"
 					android:scaleType="center" 
-					android:layout_gravity="top|left"
+					android:layout_gravity="center|left"
+					android:layout_marginLeft="67dp" android:layout_marginBottom="7dp"
 					android:layout_width="wrap_content"
-					android:layout_marginLeft="53dp"
 					android:layout_height="wrap_content"/>
 					
 					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
@@ -75,8 +75,8 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
-					android:layout_marginRight="45dp"
+					android:layout_gravity="center|right"
+					android:layout_marginRight="67dp" android:layout_marginBottom="7dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 	 		</LinearLayout>
@@ -86,8 +86,8 @@
 					<ImageView
 					android:src="@drawable/button_icon_settings"
 					android:scaleType="center" 
-					android:layout_gravity="top|left"
-					android:layout_marginLeft="53dp"
+					android:layout_gravity="center|left"
+					android:layout_marginLeft="67dp" android:layout_marginBottom="7dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 					
diff --git a/OsmAnd/res/layout-large/menu.xml b/OsmAnd/res/layout-large/menu.xml
index 771d49fc2b..5cfab3a7aa 100644
--- a/OsmAnd/res/layout-large/menu.xml
+++ b/OsmAnd/res/layout-large/menu.xml
@@ -31,7 +31,7 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_map"
 					android:scaleType="center" 
-					android:layout_gravity="center_vertical"
+					android:layout_gravity="center" android:layout_marginRight="30dp" android:layout_marginTop="30dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -47,7 +47,7 @@
 					<ImageView
 					android:src="@drawable/button_icon_search"
 					android:scaleType="center" 
-					android:layout_gravity="center_vertical|right"
+					android:layout_gravity="center" android:layout_marginLeft="30dp" android:layout_marginTop="30dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -65,7 +65,7 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites"
 					android:scaleType="center" 
-					android:layout_gravity="top"
+					android:layout_gravity="center" android:layout_marginRight="30dp" android:layout_marginTop="30dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -81,7 +81,7 @@
 					<ImageView
 					android:src="@drawable/button_icon_settings"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
+					android:layout_gravity="center" android:layout_marginLeft="30dp" android:layout_marginTop="30dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
diff --git a/OsmAnd/res/layout-small-land/menu.xml b/OsmAnd/res/layout-small-land/menu.xml
index 38f06c1679..08176d638f 100644
--- a/OsmAnd/res/layout-small-land/menu.xml
+++ b/OsmAnd/res/layout-small-land/menu.xml
@@ -31,14 +31,14 @@
 	 			<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_gravity="center_vertical" 
 					android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
-				    android:text="@string/map_Button" android:textColor="#000000"
+				    android:text="@string/map_Button" android:textColor="#000000" android:typeface="serif"
 				    android:layout_weight="1"
 				  	android:textSize="16sp"/>	
 	 			<ImageView
 					android:src="@drawable/button_icon_map"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
-					android:layout_marginRight="30dp"
+					android:layout_gravity="center|right"
+					android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 				
@@ -49,9 +49,9 @@
 					<ImageView
 					android:src="@drawable/button_icon_search"
 					android:scaleType="center" 
-					android:layout_gravity="top|left"
+					android:layout_gravity="center|left"
+					android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
-					android:layout_marginLeft="35dp"
 					android:layout_height="wrap_content"/>
 					
 					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
@@ -59,7 +59,7 @@
 					android:layout_weight="1"
 					android:layout_marginLeft="5dp"
 					android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
-				    android:text="@string/search_button"  android:textColor="#000000"
+				    android:text="@string/search_button"  android:textColor="#000000" android:typeface="serif"
 				  	android:textSize="16sp"/>	
 			</LinearLayout>
 		</TableRow>
@@ -69,14 +69,14 @@
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
 					android:layout_gravity="center_vertical|left"
-				    android:text="@string/favorites_Button"  android:textColor="#000000"
+				    android:text="@string/favorites_Button"  android:textColor="#000000" android:typeface="serif"
 				    android:layout_weight="1"
 				  	android:textSize="16sp"/>
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
-					android:layout_marginRight="30dp"
+					android:layout_gravity="center|right"
+					android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 	 		</LinearLayout>
@@ -86,8 +86,8 @@
 					<ImageView
 					android:src="@drawable/button_icon_settings"
 					android:scaleType="center" 
-					android:layout_gravity="top|left"
-					android:layout_marginLeft="35dp"
+					android:layout_gravity="center|left"
+					android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 					
@@ -96,7 +96,7 @@
 					android:layout_weight="1"
 					android:layout_marginLeft="5dp"
 					android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
-				    android:text="@string/settings_Button"  android:textColor="#000000"
+				    android:text="@string/settings_Button"  android:textColor="#000000" android:typeface="serif"
 				  	android:textSize="16sp"/>	
 			</LinearLayout>
 			</TableRow>
diff --git a/OsmAnd/res/layout-small/menu.xml b/OsmAnd/res/layout-small/menu.xml
index 8d3bf2cc43..81044c55fe 100644
--- a/OsmAnd/res/layout-small/menu.xml
+++ b/OsmAnd/res/layout-small/menu.xml
@@ -32,7 +32,7 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_map"
 					android:scaleType="center" 
-					android:layout_gravity="center_vertical"
+					android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="15dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -48,7 +48,7 @@
 					<ImageView
 					android:src="@drawable/button_icon_search"
 					android:scaleType="center" 
-					android:layout_gravity="center_vertical|right"
+					android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="15dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -66,7 +66,7 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites"
 					android:scaleType="center" 
-					android:layout_gravity="top"
+					android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="15dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -82,7 +82,7 @@
 					<ImageView
 					android:src="@drawable/button_icon_settings"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
+					android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="15dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml
index 0bd88577ae..fb86f19e2c 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -12,10 +12,10 @@
   		<ImageView android:src="@drawable/headline_osmand_icon"  
   					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
   		<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
-  				  android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp" 
+  				  android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="3dp" 
 				  android:text="OsmAnd+" android:textColor="#000000"	android:typeface="serif" android:textSize="20sp"/>
 		<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
-				  android:layout_marginTop="5dp"
+				  android:layout_marginTop="3dp"
 				  android:text="0.5.1 beta(b6)" android:textColor="#000000"	android:typeface="serif" android:id="@+id/TextVersion"
 				  android:textSize="13sp"/> 
 		<ImageView android:layout_marginRight="12dp" android:clickable="true" android:id="@+id/CloseButton"
@@ -31,7 +31,7 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_map"
 					android:scaleType="center" 
-					android:layout_gravity="center_vertical"
+					android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="20dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -47,7 +47,7 @@
 					<ImageView
 					android:src="@drawable/button_icon_search"
 					android:scaleType="center" 
-					android:layout_gravity="center_vertical|right"
+					android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="20dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -65,7 +65,7 @@
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites"
 					android:scaleType="center" 
-					android:layout_gravity="top"
+					android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="20dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
@@ -81,7 +81,7 @@
 					<ImageView
 					android:src="@drawable/button_icon_settings"
 					android:scaleType="center" 
-					android:layout_gravity="top|right"
+					android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="20dp"
 					android:layout_weight="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
diff --git a/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java b/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
index 4cbfa97c3c..311eac27e2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
@@ -138,6 +138,7 @@ public class TipsAndTricksActivity {
 				historyInd[0] ++;
 				dlg.setTitle(getTipName(toShow.get(historyInd[0])));
 				tipDescription.setText(getTipDescription(toShow.get(historyInd[0])));
+				tipDescription.scrollTo(0, 0);
 				
 				prevButton.setEnabled(historyInd[0] >  0);
 				nextButton.setEnabled(historyInd[0] < getNumberOfTips() - 1);
@@ -151,6 +152,7 @@ public class TipsAndTricksActivity {
 					historyInd[0] --;
 					dlg.setTitle(getTipName(toShow.get(historyInd[0])));
 					tipDescription.setText(getTipDescription(toShow.get(historyInd[0])));
+					tipDescription.scrollTo(0, 0);
 				}
 				prevButton.setEnabled(historyInd[0] > 0);
 				nextButton.setEnabled(historyInd[0] < getNumberOfTips() - 1);