diff --git a/apps/linking/__init__.py b/apps/linking/__init__.py
index d8a6649146..b41ef3f06e 100644
--- a/apps/linking/__init__.py
+++ b/apps/linking/__init__.py
@@ -4,8 +4,6 @@ from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
 from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
-#from backups.api import AppBackup, ModelBackup
-#from app_registry import register_app, UnableToRegister
 from documents.models import Document
 from navigation.api import bind_links, register_sidebar_template
 from project_setup.api import register_setup
@@ -35,10 +33,3 @@ class_permissions(SmartLink, [
     ACLS_EDIT_ACL,
     ACLS_VIEW_ACL
 ])
-
-#try:
-#    app = register_app('linking', _(u'Document linking'))
-#except UnableToRegister:
-#    pass
-#else:
-#    AppBackup(app, [ModelBackup()])
diff --git a/apps/linking/icons.py b/apps/linking/icons.py
index 802c8974ed..9828fbb8e0 100644
--- a/apps/linking/icons.py
+++ b/apps/linking/icons.py
@@ -1,6 +1,20 @@
 from __future__ import absolute_import
 
-from .literals import DRAW_AIRBRUSH
-from . import Icon
+from icons.literals import (PAGE_LINK, LINK, LINK_ADD, LINK_EDIT, LINK_DELETE,
+    COG, COG_ADD, COG_EDIT, COG_DELETE, LOCK)
+from icons import Icon
 
-icon_icons_app = Icon(DRAW_AIRBRUSH)
+icon_smart_link_instance_view = Icon(PAGE_LINK)
+icon_smart_link_instances_for_document = Icon(PAGE_LINK)
+icon_smart_link_setup = Icon(LINK)
+icon_smart_link_list = Icon(LINK)
+icon_smart_link_create = Icon(LINK_ADD)
+icon_smart_link_edit = Icon(LINK_EDIT)
+icon_smart_link_delete = Icon(LINK_DELETE)
+
+icon_smart_link_condition_list = Icon(COG)
+icon_smart_link_condition_create = Icon(COG_ADD)
+icon_smart_link_condition_edit = Icon(COG_EDIT)
+icon_smart_link_condition_delete = Icon(COG_DELETE)
+
+icon_smart_link_acl_list = Icon(LOCK)
diff --git a/apps/linking/links.py b/apps/linking/links.py
index 23bcb24895..4b60f1338a 100644
--- a/apps/linking/links.py
+++ b/apps/linking/links.py
@@ -8,19 +8,24 @@ from acls.permissions import ACLS_VIEW_ACL
 
 from .permissions import (PERMISSION_SMART_LINK_CREATE,
     PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
+from .icons import (icon_smart_link_instance_view, icon_smart_link_instances_for_document,
+    icon_smart_link_setup, icon_smart_link_list, icon_smart_link_create,
+    icon_smart_link_edit, icon_smart_link_delete, icon_smart_link_condition_list,
+    icon_smart_link_condition_create, icon_smart_link_condition_edit,
+    icon_smart_link_condition_delete, icon_smart_link_acl_list)
 
-smart_link_instance_view_link = Link(text=_(u'smart links actions'), view='smart_link_instance_view', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
-smart_link_instances_for_document = Link(text=_(u'smart links'), view='smart_link_instances_for_document', args='object.pk', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
+smart_link_instance_view_link = Link(text=_(u'smart links actions'), view='smart_link_instance_view', icon=icon_smart_link_instance_view, permissions=[PERMISSION_DOCUMENT_VIEW])
+smart_link_instances_for_document = Link(text=_(u'smart links'), view='smart_link_instances_for_document', args='object.pk', icon=icon_smart_link_instances_for_document, permissions=[PERMISSION_DOCUMENT_VIEW])
 
-smart_link_setup = Link(text=_(u'smart links'), view='smart_link_list', icon='link.png', permissions=[PERMISSION_SMART_LINK_CREATE], children_view_regex=[r'smart_link_list', 'smart_link_create', 'smart_link_delete', 'smart_link_edit', 'smart_link_condition_'])
-smart_link_list = Link(text=_(u'smart links list'), view='smart_link_list', sprite='link', permissions=[PERMISSION_SMART_LINK_CREATE])
-smart_link_create = Link(text=_(u'create new smart link'), view='smart_link_create', sprite='link_add', permissions=[PERMISSION_SMART_LINK_CREATE])
-smart_link_edit = Link(text=_(u'edit'), view='smart_link_edit', args='object.pk', sprite='link_edit', permissions=[PERMISSION_SMART_LINK_EDIT])
-smart_link_delete = Link(text=_(u'delete'), view='smart_link_delete', args='object.pk', sprite='link_delete', permissions=[PERMISSION_SMART_LINK_DELETE])
+smart_link_setup = Link(text=_(u'smart links'), view='smart_link_list', icon=icon_smart_link_setup, permissions=[PERMISSION_SMART_LINK_CREATE], children_view_regex=[r'smart_link_list', 'smart_link_create', 'smart_link_delete', 'smart_link_edit', 'smart_link_condition_'])
+smart_link_list = Link(text=_(u'smart links list'), view='smart_link_list', icon=icon_smart_link_list, permissions=[PERMISSION_SMART_LINK_CREATE])
+smart_link_create = Link(text=_(u'create new smart link'), view='smart_link_create', icon=icon_smart_link_create, permissions=[PERMISSION_SMART_LINK_CREATE])
+smart_link_edit = Link(text=_(u'edit'), view='smart_link_edit', args='object.pk', icon=icon_smart_link_edit, permissions=[PERMISSION_SMART_LINK_EDIT])
+smart_link_delete = Link(text=_(u'delete'), view='smart_link_delete', args='object.pk', icon=icon_smart_link_delete, permissions=[PERMISSION_SMART_LINK_DELETE])
 
-smart_link_condition_list = Link(text=_(u'conditions'), view='smart_link_condition_list', args='object.pk', sprite='cog', permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE])
-smart_link_condition_create = Link(text=_(u'create condition'), view='smart_link_condition_create', args='object.pk', sprite='cog_add', permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
-smart_link_condition_edit = Link(text=_(u'edit'), view='smart_link_condition_edit', args='condition.pk', sprite='cog_edit', permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
-smart_link_condition_delete = Link(text=_(u'delete'), view='smart_link_condition_delete', args='condition.pk', sprite='cog_delete', permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+smart_link_condition_list = Link(text=_(u'conditions'), view='smart_link_condition_list', args='object.pk', icon=icon_smart_link_condition_list, permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE])
+smart_link_condition_create = Link(text=_(u'create condition'), view='smart_link_condition_create', args='object.pk', icon=icon_smart_link_condition_create, permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+smart_link_condition_edit = Link(text=_(u'edit'), view='smart_link_condition_edit', args='condition.pk', icon=icon_smart_link_condition_edit, permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
+smart_link_condition_delete = Link(text=_(u'delete'), view='smart_link_condition_delete', args='condition.pk', icon=icon_smart_link_condition_delete, permissions=[PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
 
-smart_link_acl_list = Link(text=_(u'ACLs'), view='smart_link_acl_list', args='object.pk', sprite='lock', permissions=[ACLS_VIEW_ACL])
+smart_link_acl_list = Link(text=_(u'ACLs'), view='smart_link_acl_list', args='object.pk', icon=icon_smart_link_acl_list, permissions=[ACLS_VIEW_ACL])
diff --git a/apps/linking/views.py b/apps/linking/views.py
index 5b50fe1517..dedfe224df 100644
--- a/apps/linking/views.py
+++ b/apps/linking/views.py
@@ -133,7 +133,7 @@ def smart_link_list(request):
         'object_list': qs,
         'extra_columns': [
             {'name': _(u'dynamic title'), 'attribute': 'dynamic_title'},
-            {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
+            {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled).display_small())},
         ],
         'hide_link': True,
         'list_object_variable_name': 'smart_link',
@@ -229,7 +229,7 @@ def smart_link_condition_list(request, smart_link_pk):
         'title': _(u'conditions for smart link: %s') % smart_link,
         'object_list': smart_link.smartlinkcondition_set.all(),
         'extra_columns': [
-            {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
+            {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled).display_small())},
         ],
         'hide_link': True,
         'object': smart_link,