diff --git a/HISTORY.rst b/HISTORY.rst
index c53ac0b7bd..881d9792bd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -13,6 +13,7 @@
 - Make it clear when a setting is being overrided by an environment
   variable. Add better text explanation. Change the column to a check
   mark widget.
+- Add icons to the smart settings links.
 
 3.3.3 (2019-12-05)
 ==================
diff --git a/mayan/apps/smart_settings/icons.py b/mayan/apps/smart_settings/icons.py
index 3bb662d9aa..bcaaa04238 100644
--- a/mayan/apps/smart_settings/icons.py
+++ b/mayan/apps/smart_settings/icons.py
@@ -2,4 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 from mayan.apps.appearance.classes import Icon
 
+icon_namespace_detail = Icon(driver_name='fontawesome', symbol='sliders-h')
 icon_namespace_list = Icon(driver_name='fontawesome', symbol='sliders-h')
+icon_setting_edit = Icon(driver_name='fontawesome', symbol='times')
diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py
index bf6cf35dfb..aea6d1c9da 100644
--- a/mayan/apps/smart_settings/links.py
+++ b/mayan/apps/smart_settings/links.py
@@ -4,7 +4,9 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.navigation.classes import Link
 
-from .icons import icon_namespace_list
+from .icons import (
+    icon_namespace_detail, icon_namespace_list, icon_setting_edit
+)
 from .permissions import permission_settings_edit, permission_settings_view
 
 link_namespace_list = Link(
@@ -12,8 +14,9 @@ link_namespace_list = Link(
     text=_('Settings'), view='settings:namespace_list'
 )
 link_namespace_detail = Link(
-    args='resolved_object.name', permissions=(permission_settings_view,),
-    text=_('Settings'), view='settings:namespace_detail',
+    args='resolved_object.name', icon_class=icon_namespace_detail,
+    permissions=(permission_settings_view,), text=_('Settings'),
+    view='settings:namespace_detail'
 )
 # Duplicate the link to use a different name
 link_namespace_root_list = Link(
@@ -21,6 +24,7 @@ link_namespace_root_list = Link(
     text=_('Namespaces'), view='settings:namespace_list'
 )
 link_setting_edit = Link(
-    args='resolved_object.global_name', permissions=(permission_settings_edit,),
-    text=_('Edit'), view='settings:setting_edit_view',
+    args='resolved_object.global_name', icon_class=icon_setting_edit,
+    permissions=(permission_settings_edit,), text=_('Edit'),
+    view='settings:setting_edit_view'
 )