diff --git a/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png
new file mode 100644
index 0000000000..e3e8121828
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_delete_light.png b/OsmAnd/res/drawable-hdpi/ic_action_delete_light.png
new file mode 100644
index 0000000000..5c8cfbc783
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_delete_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png
new file mode 100644
index 0000000000..8baa0be1fa
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_delete_light.png b/OsmAnd/res/drawable-mdpi/ic_action_delete_light.png
new file mode 100644
index 0000000000..228ebe5552
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_delete_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/reset.png b/OsmAnd/res/drawable-mdpi/reset.png
deleted file mode 100644
index a7cdb8bc24..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/reset.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png
new file mode 100644
index 0000000000..9a8c7cffb5
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_delete_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_delete_light.png
new file mode 100644
index 0000000000..c3b5db6984
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_delete_light.png differ
diff --git a/OsmAnd/res/layout/open_hours_list_item.xml b/OsmAnd/res/layout/open_hours_list_item.xml
index b4fae64eaf..8f4e120c38 100644
--- a/OsmAnd/res/layout/open_hours_list_item.xml
+++ b/OsmAnd/res/layout/open_hours_list_item.xml
@@ -6,7 +6,7 @@
 	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="wrap_content"
 		android:layout_height="wrap_content" android:textSize="20sp" />
 		
-	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="@drawable/reset" 
+	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" 
 		android:contentDescription="@string/default_buttons_delete"
 		android:paddingLeft="2dp" android:paddingRight="2dp"
 		android:paddingTop="2dp" android:layout_height="wrap_content" />
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 9b4ce16a02..495a9fa299 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -14,28 +14,32 @@
 <TextView android:id="@+id/TextView" android:text="@string/search_address_region">
 </TextView>
 <Button android:id="@+id/CountryButton" android:text="@string/ChooseCountry" />
-<ImageButton android:id="@+id/ResetCountry" android:layout_marginRight = "5dp" android:background="@drawable/reset" android:contentDescription="@string/default_buttons_reset">
+<ImageButton android:id="@+id/ResetCountry" android:layout_marginRight = "5dp" android:layout_gravity="center_vertical" 
+    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp" >
 <TextView android:id="@+id/TextView" android:text="@string/search_address_city">
 </TextView>
 <Button  android:id="@+id/CityButton" android:text="@string/choose_city" />
-<ImageButton android:id="@+id/ResetCity" android:layout_marginRight = "5dp" android:background="@drawable/reset" android:contentDescription="@string/default_buttons_reset">
+<ImageButton android:id="@+id/ResetCity" android:layout_marginRight = "5dp" android:layout_gravity="center_vertical" 
+    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
 <TextView android:id="@+id/TextView" android:text="@string/search_address_street">
 </TextView>
 <Button android:id="@+id/StreetButton" android:text="@string/choose_street" />
-<ImageButton android:id="@+id/ResetStreet" android:layout_marginRight = "5dp" android:background="@drawable/reset" android:contentDescription="@string/default_buttons_reset">
+<ImageButton android:id="@+id/ResetStreet" android:layout_marginRight = "5dp" android:layout_gravity="center_vertical" 
+    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
 </ImageButton>
 </TableRow>
 <TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
 <TextView android:id="@+id/BuildingText" android:text="@string/search_address_building">
 </TextView>
 <Button android:id="@+id/BuildingButton" android:text="@string/choose_building" />
-<ImageButton android:id="@+id/ResetBuilding" android:layout_marginRight = "5dp" android:background="@drawable/reset" android:contentDescription="@string/default_buttons_reset">
+<ImageButton android:id="@+id/ResetBuilding" android:layout_marginRight = "5dp"  android:layout_gravity="center_vertical"
+    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
 </ImageButton>
 </TableRow>
 </TableLayout>
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 5685c5139d..08f13fb60f 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -18,7 +18,7 @@
         android:contentDescription="@string/default_buttons_delete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/reset"
+        android:background="?attr/reset_image"
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
         android:paddingTop="2dp" />
diff --git a/OsmAnd/res/layout/search_transport_route_item.xml b/OsmAnd/res/layout/search_transport_route_item.xml
index 00adf77e71..682d9ede61 100644
--- a/OsmAnd/res/layout/search_transport_route_item.xml
+++ b/OsmAnd/res/layout/search_transport_route_item.xml
@@ -9,7 +9,7 @@
 	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="wrap_content"
 		android:layout_height="wrap_content" android:textSize="20sp" />
 		
-	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="@drawable/reset" 
+	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" 
 		android:contentDescription="@string/default_buttons_delete"
 		android:paddingLeft="2dp" android:paddingRight="2dp"
 		android:paddingTop="2dp" android:layout_height="wrap_content" />
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 49d891cf5a..81062860ab 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -5,5 +5,6 @@
     </declare-styleable>
     <declare-styleable name="OsmAndTheme">
         <attr name="expandable_category_color" format="reference"/>
+        <attr name="reset_image" format="reference"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 4c7fc2fcbd..ee31bdedc2 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -23,6 +23,7 @@
     
     <style name="OsmandLightTheme" parent="Theme.Sherlock.Light">
         <item name="expandable_category_color">@color/group_background</item>
+        <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
     </style>
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.Sherlock.Light.DarkActionBar">
         <!--<item name="android:windowContentOverlay">@null</item>
@@ -35,11 +36,13 @@
         <item name="android:textColorTertiary">@color/activity_text</item>
         <item name="android:listViewStyle">@style/OsmandListView</item> 
         -->
+        <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
         <item name="expandable_category_color">@color/group_background</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
     </style>
     <style name="OsmandDarkTheme" parent="Theme.Sherlock">
+        <item name="reset_image">@drawable/ic_action_delete_dark</item> <!--  @drawable/a_1_navigation_cancel_dark -->
         <item name="expandable_category_color">?android:attr/colorBackground</item>
      </style>
      
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index 7908042e60..843e88d031 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -68,9 +68,7 @@ public class SearchHistoryFragment extends SherlockListFragment  implements Sear
 				clearButton.setVisibility(View.GONE);
 			}
 		});
-		if (!historyAdapter.isEmpty()) {
-			getListView().addFooterView(clearButton);
-		}
+		getListView().addFooterView(clearButton);
 	}
 	
 	@Override