diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html
index e52f3c7..444aaab 100644
--- a/templates/rrs/maintainers.html
+++ b/templates/rrs/maintainers.html
@@ -24,8 +24,11 @@
             <span class="badge" style="margin-top:11px;"></span>
             </li>
         </ul>    		
-        <form id="form-search" class="navbar-form pull-right">
-            <input type="text" class="input-xxlarge" placeholder="Search maintainers" id="filter">				
+        <form id="form-search" class="pull-right input-append">
+            <input type="text" class="input-xlarge" placeholder="Search maintainers" id="filter">				
+            <a class="add-on btn" id="clear-search-btn">
+                <i class="icon-remove"></i>
+            </a>
             <button type="submit" value="Search" class="btn btn-info" id="btn-search">Search</button>
         </form>
     </div>
@@ -156,10 +159,18 @@ $(document).ready(function() {
         event.preventDefault();
     });
 
-    $("#view-all-maintainers").click(function() {
+    function clearSearch() {
         $.uiTableFilter(statisticsTable, '');
         $("#filter").val('')
         updateMaintainerCount()
+    }
+
+    $("#view-all-maintainers").click(function() {
+        clearSearch()
+    });
+
+    $("#clear-search-btn").click(function() { 
+        clearSearch()
     });
 
 {% if maintainer_count > 0 %}
diff --git a/templates/rrs/recipes.html b/templates/rrs/recipes.html
index c3719a1..390e422 100644
--- a/templates/rrs/recipes.html
+++ b/templates/rrs/recipes.html
@@ -56,8 +56,11 @@
             </li>
         </ul>
 
-        <form id="form-search" class="navbar-form pull-right">
-            <input type="text" class="input-xxlarge" placeholder="Search all recipes" id="filter"/>                
+        <form id="form-search" class="pull-right input-append">
+            <input type="text" class="input-xlarge" placeholder="Search all recipes" id="filter"/>                
+            <a class="add-on btn" id="clear-search-btn">
+                <i class="icon-remove"></i>
+            </a>
             <button type="submit" value="Search" class="btn btn-info" id="btn-search">Search</button>
         </form>
     </div>
@@ -262,14 +265,24 @@ $(document).ready(function() {
         updateRecipeCount()
     });
 
-    $("#view-all-recipes").click(function() { 
+    function clearSearch() {
         upstreamStatus = 'All' 
         maintainer = 'All'
         applyFilters()
         $("#filter").val('')
         updateRecipeCount()
+    }
+
+    $("#view-all-recipes").click(function() { 
+        clearSearch()
     });
 
+    $("#clear-search-btn").click(function() { 
+        clearSearch()
+    });
+
+    $(".icon-remove").tooltip( {container: 'body', html: true, title: "Clear search" });
+
 {% if recipe_list_count > 0 %}
     $(recipesTable).tablesorter({
         sortList: [[0,0], [3,0], [4,0]],