diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index c40c52355a2b437c59d24e203c87b1f13264724c..2db6002c03a413eac30b6180075c0b9ec3bc6151 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -588,3 +588,5 @@ if _settings.get("celery.enabled", False) and _settings.get("search.celery", Tru
     HAYSTACK_SIGNAL_PROCESSOR = 'celery_haystack.signals.CelerySignalProcessor'
 else:
     HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
+
+HAYSTACK_SEARCH_RESULTS_PER_PAGE = 10
diff --git a/aleksis/core/templates/search/search.html b/aleksis/core/templates/search/search.html
index acb130e0e2fe3797720196b8e8448b83e3341baa..873ffffddf5eda0b15d7bd0700d4bbb475654155 100644
--- a/aleksis/core/templates/search/search.html
+++ b/aleksis/core/templates/search/search.html
@@ -11,6 +11,7 @@
   <form method="get">
     {% form form=form %}{% endform %}
     <button type="submit" class="btn waves-effect waves-light green">
+    <i class="material-icons left">search</i>
       {% blocktrans %}Search{% endblocktrans %}
     </button>
   </form>
@@ -18,16 +19,18 @@
    {% if query %}
      <h3>Results</h3>
 
+     <div class="collection">
      {% for result in page.object_list %}
-       <p>
-         <i class="material-icons">{{ result.object.icon_ }}</i>
-         <a href="{{ result.object.get_absolute_url|default:"#" }}">
+         <a href="{{ result.object.get_absolute_url|default:"#" }}" class="collection-item">
+         <i class="material-icons left">{{ result.object.icon_ }}</i>
            {{ result.object }}
          </a>
-       </p>
      {% empty %}
-       {# FIXME Add a note if no results were found #}
+       <li class="collection-item">
+        {% trans "No search results could be found to your search" %}
+       </li>
      {% endfor %}
+     </div>
 
      {% if page.has_other_pages %}
        <ul class="pagination">