diff --git a/android/res/drawable-mdpi/food.png b/android/res/drawable-mdpi/food.png
new file mode 100644
index 0000000000..1eb3737759
Binary files /dev/null and b/android/res/drawable-mdpi/food.png differ
diff --git a/android/res/drawable-mdpi/fuel.png b/android/res/drawable-mdpi/fuel.png
new file mode 100644
index 0000000000..69f75958d3
Binary files /dev/null and b/android/res/drawable-mdpi/fuel.png differ
diff --git a/android/res/drawable-mdpi/money.png b/android/res/drawable-mdpi/money.png
new file mode 100644
index 0000000000..11b3c161e2
Binary files /dev/null and b/android/res/drawable-mdpi/money.png differ
diff --git a/android/res/drawable-mdpi/shop.png b/android/res/drawable-mdpi/shop.png
new file mode 100644
index 0000000000..aecb89a4bd
Binary files /dev/null and b/android/res/drawable-mdpi/shop.png differ
diff --git a/android/res/drawable-mdpi/tourism.png b/android/res/drawable-mdpi/tourism.png
new file mode 100644
index 0000000000..2e7432a921
Binary files /dev/null and b/android/res/drawable-mdpi/tourism.png differ
diff --git a/android/res/drawable-mdpi/transport.png b/android/res/drawable-mdpi/transport.png
new file mode 100644
index 0000000000..e221611f06
Binary files /dev/null and b/android/res/drawable-mdpi/transport.png differ
diff --git a/android/res/drawable-xhdpi/food.png b/android/res/drawable-xhdpi/food.png
new file mode 100644
index 0000000000..afc25529ba
Binary files /dev/null and b/android/res/drawable-xhdpi/food.png differ
diff --git a/android/res/drawable-xhdpi/fuel.png b/android/res/drawable-xhdpi/fuel.png
new file mode 100644
index 0000000000..ff8c3f87af
Binary files /dev/null and b/android/res/drawable-xhdpi/fuel.png differ
diff --git a/android/res/drawable-xhdpi/money.png b/android/res/drawable-xhdpi/money.png
new file mode 100644
index 0000000000..ee6d63ee29
Binary files /dev/null and b/android/res/drawable-xhdpi/money.png differ
diff --git a/android/res/drawable-xhdpi/shop.png b/android/res/drawable-xhdpi/shop.png
new file mode 100644
index 0000000000..ea437f5502
Binary files /dev/null and b/android/res/drawable-xhdpi/shop.png differ
diff --git a/android/res/drawable-xhdpi/tourism.png b/android/res/drawable-xhdpi/tourism.png
new file mode 100644
index 0000000000..97d1234ec4
Binary files /dev/null and b/android/res/drawable-xhdpi/tourism.png differ
diff --git a/android/res/drawable-xhdpi/transport.png b/android/res/drawable-xhdpi/transport.png
new file mode 100644
index 0000000000..1b6761061a
Binary files /dev/null and b/android/res/drawable-xhdpi/transport.png differ
diff --git a/android/res/layout/search_list_view.xml b/android/res/layout/search_list_view.xml
index 42a3540021..79b9db3e0e 100644
--- a/android/res/layout/search_list_view.xml
+++ b/android/res/layout/search_list_view.xml
@@ -1,18 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-         android:orientation="vertical"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:paddingLeft="8dp"
-         android:paddingRight="8dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp">
 
-     <EditText android:id="@+id/search_string"
-               android:inputType="text"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"/>
+    <EditText android:id="@+id/search_string"
+              android:inputType="text"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"/>
 
-     <ListView android:id="@android:id/list"
-               android:layout_width="match_parent"
-               android:layout_height="0dp"
-               android:layout_weight="1"/>
- </LinearLayout>
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:layout_height="40dp">
+
+        <Button android:id="@+id/search_food"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/food"
+                android:onClick="onSearchFood"/>
+
+        <Button android:id="@+id/search_money"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/money"
+                android:onClick="onSearchMoney"/>
+
+        <Button android:id="@+id/search_fuel"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/fuel"
+                android:onClick="onSearchFuel"/>
+
+        <Button android:id="@+id/search_shop"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/shop"
+                android:onClick="onSearchShop"/>
+
+        <Button android:id="@+id/search_transport"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/transport"
+                android:onClick="onSearchTransport"/>
+
+        <Button android:id="@+id/search_tourism"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/tourism"
+                android:onClick="onSearchTourism"/>
+
+    </LinearLayout>
+
+    <ListView android:id="@android:id/list"
+              android:layout_width="match_parent"
+              android:layout_height="0dp"
+              android:layout_weight="1"/>
+</LinearLayout>
diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index c7e0426cd0..625898604f 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -339,6 +339,22 @@ public class SearchActivity extends ListActivity implements LocationService.List
     });
   }
 
+  /// @name Amenity buttons listeners
+  //@{
+  public void onSearchFood(View v) { runSearchForButton("food"); }
+  public void onSearchMoney(View v) { runSearchForButton("money"); }
+  public void onSearchFuel(View v) { runSearchForButton("fuel"); }
+  public void onSearchShop(View v) { runSearchForButton("shop"); }
+  public void onSearchTransport(View v) { runSearchForButton("transport"); }
+  public void onSearchTourism(View v) { runSearchForButton("tourism"); }
+  //@}
+
+  private void runSearchForButton(String s)
+  {
+    // this call invokes runSearch
+    getSearchBox().setText(s + " ");
+  }
+
   private void runSearch()
   {
     // TODO Need to get input language