diff --git a/HISTORY.rst b/HISTORY.rst
index 7967d466e6..879556a5d9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -202,6 +202,9 @@
 * Improve speed of the NPM package hash verification.
 * Add view to enable smart links for documents types
   from the document type side.
+* Enable list link icons.
+* Add outline links CSS for facets.
+* Add a bottom margin to list links.
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index d3b0504076..36334f2f5d 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -234,6 +234,9 @@ Other changes
 * Improve speed of the NPM package hash verification.
 * Add view to enable smart links for documents types
   from the document type side.
+* Enable list link icons.
+* Add outline links CSS for facets.
+* Add a bottom margin to list links.
 
 Removals
 --------
diff --git a/mayan/apps/appearance/static/appearance/css/base.css b/mayan/apps/appearance/static/appearance/css/base.css
index 608799b022..cdd1c5e0ce 100644
--- a/mayan/apps/appearance/static/appearance/css/base.css
+++ b/mayan/apps/appearance/static/appearance/css/base.css
@@ -409,3 +409,43 @@ a i {
         padding-right: 140px;
     }
 }
+
+
+/*Bootstrap button outline override*/
+.btn-outline {
+    background-color: transparent;
+    color: inherit;
+    /*transition: all .25s;*/
+}
+
+.btn-primary.btn-outline {
+    color: #428bca;
+}
+
+.btn-success.btn-outline {
+    color: #5cb85c;
+}
+
+.btn-info.btn-outline {
+    color: #5bc0de;
+}
+
+.btn-warning.btn-outline {
+    color: #f0ad4e;
+}
+
+.btn-danger.btn-outline {
+    color: #d9534f;
+}
+
+.btn-primary.btn-outline:hover,
+.btn-success.btn-outline:hover,
+.btn-info.btn-outline:hover,
+.btn-warning.btn-outline:hover,
+.btn-danger.btn-outline:hover {
+    color: #fff;
+}
+
+.btn-list {
+    margin-bottom: 2px;
+}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
index 5a23ae15d5..d0aa3d6b88 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
@@ -144,7 +144,7 @@
                                                 {% for link_group in facet_menu_results.link_groups %}
                                                     {% with link_group.links as object_navigation_links %}
                                                     {% with 'true' as horizontal %}
-                                                    {% with 'true' as hide_icon %}
+                                                    {% with 'btn btn-default btn-outline btn-xs btn-list' as link_classes %}
                                                         {% include 'navigation/generic_navigation.html' %}
                                                     {% endwith %}
                                                     {% endwith %}
@@ -155,8 +155,8 @@
                                             {% for object_menu_results in object_menus_results %}
                                                 {% for link_group in object_menu_results.link_groups %}
                                                     {% with link_group.links as object_navigation_links %}
+                                                    {% with 'btn-list' as link_extra_classes %}
                                                     {% with 'true' as horizontal %}
-                                                    {% with 'true' as hide_icon %}
                                                         {% include 'navigation/generic_navigation.html' %}
                                                     {% endwith %}
                                                     {% endwith %}
diff --git a/mayan/apps/navigation/templates/navigation/generic_link_instance.html b/mayan/apps/navigation/templates/navigation/generic_link_instance.html
index 6a99960826..3edb92be59 100644
--- a/mayan/apps/navigation/templates/navigation/generic_link_instance.html
+++ b/mayan/apps/navigation/templates/navigation/generic_link_instance.html
@@ -4,10 +4,10 @@
     <li class="text-center link-text-span" >{{ link.text }}</li>
 {% else %}
     {% if link.disabled %}
-        <a class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %} disabled" disabled='disabled' style="cursor: default;" href="#">{% if link.icon_class %}{{ link.icon_class.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}</a>{% if horizontal %}{% if not forloop.last %}&nbsp;{% endif %}{% endif %}
+        <a class="{{ link.html_extra_classes }} {{ link_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %} disabled" disabled='disabled' style="cursor: default;" href="#">{% if link.icon_class %}{{ link.icon_class.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}</a>{% if horizontal %}{% if not forloop.last %}&nbsp;{% endif %}{% endif %}
     {% else %}
         <a
-            class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %}"
+            class="{{ link.html_extra_classes }} {{ link_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %}"
             {% for key,value in link.html_data.items %}
                 data-{{ key }}={{ value }}
             {% endfor %}