diff --git a/apps/dynamic_search/links.py b/apps/dynamic_search/links.py
index 9abdf27eeb..7e7ac9ad94 100644
--- a/apps/dynamic_search/links.py
+++ b/apps/dynamic_search/links.py
@@ -7,6 +7,6 @@ from navigation.api import Link
 from .icons import icon_search
 
 menu_link = Link(text=_(u'search'), view='search', icon=icon_search, children_url_regex=[r'^search/'])
-search = Link(text=_(u'search'), view='search', sprite='zoom')
+search = Link(text=_(u'search'), view='search', icon=icon_search)
 search_advanced = Link(text=_(u'advanced search'), view='search_advanced', sprite='zoom_in')
 search_again = Link(text=_(u'search again'), view='search_again', sprite='arrow_undo')
diff --git a/apps/dynamic_search/templatetags/search_tags.py b/apps/dynamic_search/templatetags/search_tags.py
index e48852685f..a8a2b6c46b 100644
--- a/apps/dynamic_search/templatetags/search_tags.py
+++ b/apps/dynamic_search/templatetags/search_tags.py
@@ -8,24 +8,11 @@ from haystack.forms import SearchForm
 
 from ..models import RecentSearch
 from ..conf.settings import RECENT_COUNT
+from ..icons import icon_search
 
 register = Library()
 
 
-@register.inclusion_tag('search_results_subtemplate.html', takes_context=True)
-def search_form(context):
-    context.update({
-        'form': SearchForm(initial={'q': context.get('query_string', {}).get('q'), 'source': 'sidebar'}),
-        'request': context['request'],
-        'STATIC_URL': context['STATIC_URL'],
-        'form_action': reverse('search'),
-        'form_title': _(u'Search'),
-        'submit_label': _(u'Search'),
-        'submit_icon_famfam': 'zoom',
-    })
-    return ''
-
-
 @register.inclusion_tag('generic_subtemplate.html', takes_context=True)
 def recent_searches_template(context):
     recent_searches = RecentSearch.objects.get_for_user(user=context['user'])
@@ -35,10 +22,10 @@ def recent_searches_template(context):
         'side_bar': True,
         'title': _(u'recent searches (maximum of %d)') % RECENT_COUNT,
         'paragraphs': [
-            u'<a href="%(url)s"><span class="famfam active famfam-%(icon)s"></span>%(text)s</a>' % {
+            u'<a href="%(url)s">%(icon)s%(text)s</a>' % {
                 'text': recent_search,
                 'url': recent_search.get_absolute_url(),
-                'icon': 'zoom_in' if recent_search.is_advanced() else 'zoom',
+                'icon': 'zoom_in' if recent_search.is_advanced() else icon_search.display_small(),
             } for recent_search in recent_searches
         ]
     })
diff --git a/apps/dynamic_search/views.py b/apps/dynamic_search/views.py
index 03bcfba8d3..43b111e154 100644
--- a/apps/dynamic_search/views.py
+++ b/apps/dynamic_search/views.py
@@ -13,6 +13,7 @@ from permissions.models import Permission
 from acls.models import AccessEntry
 
 from .models import RecentSearch
+from .icons import icon_search
 
 
 class CustomSearchView(SearchView):
@@ -39,7 +40,7 @@ class CustomSearchView(SearchView):
             'object_list': object_list,
             'suggestion': None,
             'submit_label': _(u'Search'),
-            'submit_icon_famfam': 'zoom',
+            'submit_icon': icon_search,
             'form_title': _(u'Search'),
             'form_hide_required_text': True,
             'list_title': _(u'results for: %s') % self.query,