diff --git a/android/res/drawable-hdpi/ic_action_cancel.png b/android/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 0000000000..f889617e44
Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_cancel.png differ
diff --git a/android/res/drawable-mdpi/ic_action_cancel.png b/android/res/drawable-mdpi/ic_action_cancel.png
new file mode 100644
index 0000000000..e84853e4f5
Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_cancel.png differ
diff --git a/android/res/drawable-xhdpi/ic_action_cancel.png b/android/res/drawable-xhdpi/ic_action_cancel.png
new file mode 100644
index 0000000000..58e2e3b4d8
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_action_cancel.png differ
diff --git a/android/res/drawable-xxhdpi/ic_action_cancel.png b/android/res/drawable-xxhdpi/ic_action_cancel.png
new file mode 100644
index 0000000000..a9bbcde5a0
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_action_cancel.png differ
diff --git a/android/res/layout/search_list_view.xml b/android/res/layout/search_list_view.xml
index 128ad47284..31225fa99c 100644
--- a/android/res/layout/search_list_view.xml
+++ b/android/res/layout/search_list_view.xml
@@ -7,29 +7,43 @@
     android:paddingLeft="@dimen/dp_x_2"
     android:paddingRight="@dimen/dp_x_2" >
 
-    <RelativeLayout
+    <LinearLayout
+        style="@style/Holo.EditText.Light"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:addStatesFromChildren="true"
+        android:gravity="center_vertical"
         android:orientation="horizontal" >
 
         <EditText
             android:id="@+id/search_string"
             style="@style/Holo.TextAppearance.Large.Light"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@null"
             android:hint="@string/search_map"
-            android:inputType="text" />
+            android:inputType="text"
+            android:paddingBottom="8dp"
+            android:paddingTop="8dp" />
 
         <ProgressBar
             android:id="@+id/search_progress"
             style="@style/Holo.ProgressBar.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="8dp"
+            android:layout_weight="0"
             android:visibility="gone" />
-    </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/btn_clear_query"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:padding="4dp"
+            android:src="@drawable/ic_action_cancel"
+            android:visibility="gone" />
+    </LinearLayout>
 
     <Spinner
         android:id="@+id/search_modes_spinner"
diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index 1f8a011452..b4825dcefe 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -13,6 +13,7 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -26,6 +27,7 @@ import android.widget.TextView;
 import com.mapswithme.maps.base.MapsWithMeBaseListActivity;
 import com.mapswithme.maps.location.LocationService;
 import com.mapswithme.util.Language;
+import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.statistics.Statistics;
 
@@ -50,6 +52,7 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
     private final SearchActivity m_context;
     private final LayoutInflater m_inflater;
 
+
     private final Resources m_resource;
     private final String m_packageName;
 
@@ -407,6 +410,7 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
   private EditText m_searchBox;
   private ProgressBar m_progress;
   private Spinner m_modesSpinner;
+  private View mClearQueryBtn;
 
   @SuppressLint("NewApi")
   @Override
@@ -450,6 +454,15 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
   private void setUpView()
   {
     m_progress = (ProgressBar) findViewById(R.id.search_progress);
+    mClearQueryBtn = findViewById(R.id.btn_clear_query);
+    mClearQueryBtn.setOnClickListener(new OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        m_searchBox.getText().clear();
+      }
+    });
 
     // Initialize search edit box processor.
     m_searchBox = (EditText) findViewById(R.id.search_string);
@@ -460,6 +473,11 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
       {
         if (runSearch() == QUERY_EMPTY)
           showCategories();
+
+        if (s.length() == 0)
+          UiUtils.hide(mClearQueryBtn);
+        else
+          UiUtils.show(mClearQueryBtn);
       }
 
       @Override