diff --git a/OsmAnd/res/drawable/bg_left.xml b/OsmAnd/res/drawable/bg_left.xml
index e24679df03..2a8e615388 100644
--- a/OsmAnd/res/drawable/bg_left.xml
+++ b/OsmAnd/res/drawable/bg_left.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:state_pressed="true" android:drawable="@drawable/bg_left_pushed" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_left_pushed" />
     <item android:drawable="@drawable/bg_left_simple"  />
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_leftr.xml b/OsmAnd/res/drawable/bg_leftr.xml
index 14ff0717dd..c8c07cc8c8 100644
--- a/OsmAnd/res/drawable/bg_leftr.xml
+++ b/OsmAnd/res/drawable/bg_leftr.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/bg_leftr_pushed" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_leftr_pushed" />
     <item android:drawable="@drawable/bg_leftr_simple" />
 </selector>
diff --git a/OsmAnd/res/drawable/bg_right.xml b/OsmAnd/res/drawable/bg_right.xml
index 5ebba5c1f5..b557d28366 100644
--- a/OsmAnd/res/drawable/bg_right.xml
+++ b/OsmAnd/res/drawable/bg_right.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/bg_right_pushed" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_right_pushed" />
     <item android:drawable="@drawable/bg_right_simple" />
 </selector>
diff --git a/OsmAnd/res/drawable/bg_rightr.xml b/OsmAnd/res/drawable/bg_rightr.xml
index ce1d71446a..73719f59d9 100644
--- a/OsmAnd/res/drawable/bg_rightr.xml
+++ b/OsmAnd/res/drawable/bg_rightr.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/bg_rightr_pushed" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_rightr_pushed" />
     <item android:drawable="@drawable/bg_rightr_simple" />
 </selector>
diff --git a/OsmAnd/res/drawable/button_left.xml b/OsmAnd/res/drawable/button_left.xml
index f6ae1ebf52..9a97960fa7 100644
--- a/OsmAnd/res/drawable/button_left.xml
+++ b/OsmAnd/res/drawable/button_left.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true" android:drawable="@drawable/button_left_pushed" />
+	<item android:state_focused="true" android:drawable="@drawable/button_left_pushed" />
     <item android:drawable="@drawable/button_left_simple" />
 </selector>
diff --git a/OsmAnd/res/drawable/button_right.xml b/OsmAnd/res/drawable/button_right.xml
index dd51234bc2..6808dcd94f 100644
--- a/OsmAnd/res/drawable/button_right.xml
+++ b/OsmAnd/res/drawable/button_right.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true" android:drawable="@drawable/button_right_pushed" />
+	<item android:state_focused="true" android:drawable="@drawable/button_right_pushed" />
     <item android:drawable="@drawable/button_right_simple" />
 </selector>
diff --git a/OsmAnd/res/drawable/headliner_close.xml b/OsmAnd/res/drawable/headliner_close.xml
index 02a7eaf610..00eaea40d7 100644
--- a/OsmAnd/res/drawable/headliner_close.xml
+++ b/OsmAnd/res/drawable/headliner_close.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true" android:drawable="@drawable/headline_close_button_pressed" />
+	<item android:state_focused="true" android:drawable="@drawable/headline_close_button_pressed" />
     <item android:drawable="@drawable/headline_close_button" />
 </selector>
diff --git a/OsmAnd/res/drawable/help_icon.xml b/OsmAnd/res/drawable/help_icon.xml
index 6c34c5011c..f4c9cc31ce 100644
--- a/OsmAnd/res/drawable/help_icon.xml
+++ b/OsmAnd/res/drawable/help_icon.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true" android:drawable="@drawable/help_icon_pressed" />
+	<item android:state_focused="true" android:drawable="@drawable/help_icon_pressed" />
     <item android:drawable="@drawable/help_icon_simple" />
 </selector>
diff --git a/OsmAnd/res/layout-land/menu.xml b/OsmAnd/res/layout-land/menu.xml
index f4524521fb..485ff494c2 100644
--- a/OsmAnd/res/layout-land/menu.xml
+++ b/OsmAnd/res/layout-land/menu.xml
@@ -19,9 +19,10 @@
 				  android:text="0.5.1 beta(b6)" android:textColor="#000000"	android:typeface="serif" android:id="@+id/TextVersion"
 				  android:textSize="13sp"/> 
 		<ImageView android:src="@drawable/help_icon"  android:id="@+id/HelpButton" android:layout_marginTop="3dp"
-  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="4dp"/>
+  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="4dp"
+  					android:focusable="true" android:clickable="true"/>
 		<ImageView android:src="@drawable/headliner_close"  android:layout_marginRight="2dp" android:id="@+id/CloseButton"
-					android:layout_marginTop="3dp"
+					android:layout_marginTop="3dp" android:focusable="true" android:clickable="true"
   					android:layout_height="wrap_content" android:layout_width="wrap_content"/>		  
 	</LinearLayout>
 	</LinearLayout>
@@ -29,7 +30,7 @@
 	<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" >
 	 	<TableRow android:layout_height = "wrap_content"  android:layout_marginTop = "4dp">
 	 		<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_left" android:clickable="true"
-	 					android:layout_weight="1" android:layout_height="112dp">
+	 					android:layout_weight="1" android:layout_height="112dp" android:focusable="true">
 	 			<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_gravity="center_vertical" 
 					android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
@@ -44,7 +45,7 @@
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
 			<LinearLayout android:id="@+id/SearchButton"  android:background="@drawable/bg_right" android:clickable="true"
-						android:layout_weight="1" android:layout_height="112dp">
+						android:layout_weight="1" android:layout_height="112dp" android:focusable="true">
 				<ImageView
 					android:src="@drawable/button_icon_search"
 					android:layout_gravity="center|left"
@@ -62,7 +63,7 @@
 		</TableRow>
 		<TableRow android:layout_height = "wrap_content" android:layout_marginTop = "4dp"  >
 		<LinearLayout android:id="@+id/FavoritesButton"  android:background="@drawable/bg_left" 
-					android:layout_weight="1" android:layout_height="112dp">
+					android:layout_weight="1" android:layout_height="112dp" android:focusable="true" android:clickable="true">
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_marginLeft="15dp" android:layout_gravity="center_vertical|left"
 				    android:text="@string/favorites_Button"  android:textColor="#000000" android:typeface="serif"
@@ -76,7 +77,7 @@
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
 			<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_right" 
-					android:layout_weight="1" android:layout_height="112dp">
+					android:layout_weight="1" android:layout_height="112dp" android:focusable="true" android:clickable="true">
 				<ImageView
 					android:src="@drawable/button_icon_settings"
 					android:layout_gravity="center|left"
diff --git a/OsmAnd/res/layout-large-land/menu.xml b/OsmAnd/res/layout-large-land/menu.xml
index 1ff56193dd..31c755b919 100644
--- a/OsmAnd/res/layout-large-land/menu.xml
+++ b/OsmAnd/res/layout-large-land/menu.xml
@@ -19,16 +19,18 @@
 				  android:text="0.5.1 beta(b6)" android:textColor="#000000"	android:typeface="serif" android:id="@+id/TextVersion"
 				  android:textSize="18sp"/> 
         <ImageView android:src="@drawable/help_icon"  android:id="@+id/HelpButton" android:layout_marginTop="5dp"
+        			android:focusable="true" android:clickable="true"
   					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="6dp"/>				  
 		<ImageView android:src="@drawable/headliner_close"  android:layout_marginRight="4dp" android:id="@+id/CloseButton"
-						android:layout_marginTop="5dp"
+					android:layout_marginTop="5dp" android:focusable="true" android:clickable="true"
   					android:layout_height="wrap_content" android:layout_width="wrap_content"/>		  
 	</LinearLayout>
 	</LinearLayout>
 	
 	<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp">
 	 	<TableRow android:layout_height = "wrap_content"  >
-	 		<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_left" android:clickable="true"
+	 		<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_left" 
+	 					android:focusable="true" android:clickable="true"
 	 					android:layout_weight="1" android:layout_height="165dp">
 	 			<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_gravity="center_vertical" 
@@ -43,7 +45,8 @@
 					android:layout_height="wrap_content"/>
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
-			<LinearLayout android:id="@+id/SearchButton"  android:background="@drawable/bg_right" android:clickable="true"
+			<LinearLayout android:id="@+id/SearchButton"  android:background="@drawable/bg_right" 
+						android:focusable="true" android:clickable="true"
 						android:layout_weight="1" android:layout_height="165dp">
 				<ImageView
 					android:src="@drawable/button_icon_search"
@@ -60,7 +63,8 @@
 			</LinearLayout>
 		</TableRow>
 		<TableRow android:layout_height = "wrap_content" android:layout_marginTop = "15dp"  >
-		<LinearLayout android:id="@+id/FavoritesButton"  android:background="@drawable/bg_left" 
+		<LinearLayout android:id="@+id/FavoritesButton"  android:background="@drawable/bg_left"
+					android:focusable="true" android:clickable="true" 
 					android:layout_weight="1" android:layout_height="165dp">
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 					android:layout_marginLeft="15dp" android:layout_gravity="center_vertical|left"
@@ -74,7 +78,8 @@
 					android:layout_height="wrap_content"/>
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
-			<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_right" 
+			<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_right"
+					android:focusable="true" android:clickable="true" 
 					android:layout_weight="1" android:layout_height="165dp">
 				<ImageView
 					android:src="@drawable/button_icon_settings"
diff --git a/OsmAnd/res/layout-large/menu.xml b/OsmAnd/res/layout-large/menu.xml
index 71ad03dd0b..c6d0a05aa6 100644
--- a/OsmAnd/res/layout-large/menu.xml
+++ b/OsmAnd/res/layout-large/menu.xml
@@ -19,18 +19,19 @@
 				  android:text="0.5.1 beta(b6)" android:textColor="#000000"	android:typeface="serif" android:id="@+id/TextVersion"
 				  android:textSize="20sp"/> 
 				  
-		<ImageView android:id="@+id/HelpButton" android:layout_marginRight="0dp" android:clickable="true" android:layout_marginTop="6dp"
-  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="7dp" android:src="@drawable/help_icon"/>			  
-		<ImageView android:src="@drawable/headliner_close"  android:layout_marginRight="4dp" android:clickable="true" android:id="@+id/CloseButton"
-					android:layout_marginTop="6dp"
+		<ImageView android:id="@+id/HelpButton" android:layout_marginRight="0dp" android:layout_marginTop="6dp"
+  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="7dp" 
+  					android:focusable="true" android:clickable="true" android:src="@drawable/help_icon"/>			  
+		<ImageView android:src="@drawable/headliner_close"  android:layout_marginRight="4dp" android:id="@+id/CloseButton"
+					android:layout_marginTop="6dp" android:focusable="true" android:clickable="true"
   					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="0dp"/>		  
 	</LinearLayout>
 	</LinearLayout>
 	
 	<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
 	 	<TableRow android:layout_height = "wrap_content"  android:layout_marginTop="35dp" >
-	 		<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true"
-	 					android:layout_weight="3"  android:layout_height="250dp">
+	 		<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_leftr" android:orientation="vertical"
+	 					android:focusable="true" android:clickable="true" android:layout_weight="3"  android:layout_height="250dp">
 	 			<ImageView
 					android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center"
 					 android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
@@ -41,8 +42,8 @@
 				</LinearLayout>	
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
-			<LinearLayout android:id="@+id/SearchButton"  android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true"
-					android:layout_weight="3"  android:layout_height="250dp">
+			<LinearLayout android:id="@+id/SearchButton"  android:background="@drawable/bg_rightr" android:orientation="vertical"
+					android:focusable="true" android:clickable="true" android:layout_weight="3"  android:layout_height="250dp">
 				<ImageView
 					android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center"
 					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
@@ -54,8 +55,8 @@
 			</LinearLayout>
 		</TableRow>
 		<TableRow android:layout_height = "wrap_content" android:layout_marginTop="35dp" >
-			<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true"
-	 					android:layout_weight="3" android:layout_height="250dp">
+			<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_leftr" android:orientation="vertical"
+	 					android:focusable="true" android:clickable="true" android:layout_weight="3" android:layout_height="250dp">
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center"
 					 android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
@@ -66,8 +67,8 @@
 				</LinearLayout>
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
-			<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true"
-						android:layout_weight="3" android:layout_height="250dp">
+			<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_rightr" android:orientation="vertical" 
+						android:focusable="true" android:clickable="true" android:layout_weight="3" android:layout_height="250dp">
 				<ImageView
 					android:src="@drawable/button_icon_settings" android:scaleType="center" android:layout_gravity="center"
 					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 7043b9d348..e850e2760c 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -19,17 +19,19 @@
 				  android:text="0.5.1 beta(b6)" android:textColor="#000000"	android:typeface="serif" android:id="@+id/TextVersion"
 				  android:textSize="13sp"/> 
 	    <ImageView android:id="@+id/HelpButton" android:clickable="true" android:layout_marginTop="4dp" android:layout_marginLeft="4dp" 
-  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/help_icon"/>				  
+  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/help_icon"
+  					android:focusable="true"/>				  
 		<ImageView android:layout_marginRight="2dp" android:clickable="true" android:id="@+id/CloseButton"
 					android:layout_marginTop="4dp"
-  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="0dp" android:src="@drawable/headliner_close"/>		  
+  					android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="0dp" android:src="@drawable/headliner_close"
+  					android:focusable="true"/>		  
 	</LinearLayout>
 	</LinearLayout>
 	
 	<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
 	 	<TableRow android:layout_height = "wrap_content"  android:layout_marginTop="20dp" >
 	 		<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true"
-	 					android:layout_weight="3"  android:layout_height="175dp">
+	 					android:layout_weight="3"  android:layout_height="175dp" android:focusable="true">
 	 			<ImageView
 					android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center"
 					 android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
@@ -41,7 +43,7 @@
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
 			<LinearLayout android:id="@+id/SearchButton"  android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true"
-						android:layout_weight="3"  android:layout_height="175dp">
+						android:layout_weight="3"  android:layout_height="175dp" android:focusable="true">
 					<ImageView
 					android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center"
 					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
@@ -55,7 +57,7 @@
 		</TableRow>
 		<TableRow android:layout_height = "wrap_content" android:layout_marginTop="10dp">
 			<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_leftr" android:orientation="vertical" android:clickable="true"
-	 					android:layout_weight="3" android:layout_height="175dp">
+	 					android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
 	 			<ImageView
 					android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center"
 					 android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
@@ -67,7 +69,7 @@
 	 		</LinearLayout>
 			<LinearLayout android:layout_weight="2" android:layout_height="fill_parent" />
 			<LinearLayout android:id="@+id/SettingsButton"  android:background="@drawable/bg_rightr" android:orientation="vertical" android:clickable="true"
-						android:layout_weight="3" android:layout_height="175dp">
+						android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
 				<ImageView
 					android:src="@drawable/button_icon_settings" android:scaleType="center" android:layout_gravity="center"
 					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>