diff --git a/apps/linking/conf/__init__.py b/apps/linking/conf/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/linking/conf/settings.py b/apps/linking/conf/settings.py
deleted file mode 100644
index bb610b7007..0000000000
--- a/apps/linking/conf/settings.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Configuration options for the linking app"""
-
-from django.utils.translation import ugettext_lazy as _
-
-from smart_settings.api import Setting, SettingNamespace
-
-namespace = SettingNamespace('linking', _(u'Linking'), module='linking.conf.settings', sprite='link')
-
-Setting(
-    namespace=namespace,
-    name='SHOW_EMPTY_SMART_LINKS',
-    global_name='LINKING_SHOW_EMPTY_SMART_LINKS',
-    default=True,
-    description=_(u'Show smart link that don\'t return any documents.')
-)
diff --git a/apps/linking/icons.py b/apps/linking/icons.py
new file mode 100644
index 0000000000..802c8974ed
--- /dev/null
+++ b/apps/linking/icons.py
@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+
+from .literals import DRAW_AIRBRUSH
+from . import Icon
+
+icon_icons_app = Icon(DRAW_AIRBRUSH)
diff --git a/apps/linking/registry.py b/apps/linking/registry.py
new file mode 100644
index 0000000000..6a6cafdaed
--- /dev/null
+++ b/apps/linking/registry.py
@@ -0,0 +1,20 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from smart_settings import LocalScope
+
+#from .icons import icon_tick
+
+label = _(u'Document linking')
+#description = _(u'Contains many commonly used models, views and utilities.')
+dependencies = ['app_registry', 'icons', 'navigation', 'documents', 'metadata']
+#icon = icon_tick
+settings = [
+    {
+        'name': 'SHOW_EMPTY_SMART_LINKS',
+        'default': True,
+        'description': _(u'Show smart link that don\'t return any documents.'),
+        'scopes': [LocalScope()]
+    }
+]
diff --git a/apps/linking/views.py b/apps/linking/views.py
index 66d481fa20..5b50fe1517 100644
--- a/apps/linking/views.py
+++ b/apps/linking/views.py
@@ -21,7 +21,7 @@ from acls.models import AccessEntry
 from acls.utils import apply_default_acls
 
 from .models import SmartLink, SmartLinkCondition
-from .conf.settings import SHOW_EMPTY_SMART_LINKS
+from .settings import SHOW_EMPTY_SMART_LINKS
 from .forms import (SmartLinkInstanceForm, SmartLinkForm,
     SmartLinkConditionForm)
 from .links import smart_link_instance_view_link