diff --git a/apps/django_gpg/__init__.py b/apps/django_gpg/__init__.py
index 0ec0dd4b86..87f1dadc61 100644
--- a/apps/django_gpg/__init__.py
+++ b/apps/django_gpg/__init__.py
@@ -1,12 +1,12 @@
 from __future__ import absolute_import
 
 from navigation.api import bind_links
-from project_setup.api import register_setup
+#from project_setup.api import register_setup
 from hkp import Key as KeyServerKey
 
 from .api import Key
 from .links import (private_keys, public_keys, key_delete, key_query,
-    key_receive, key_setup)
+    key_receive)#, key_setup)
 
 #bind_links(['key_delete', 'key_private_list', 'key_public_list', 'key_query'], [private_keys, public_keys, key_query], menu_name='sidebar')
 bind_links(['key_delete', 'key_public_list', 'key_query'], [public_keys, key_query], menu_name='sidebar')
@@ -14,4 +14,4 @@ bind_links(['key_delete', 'key_public_list', 'key_query'], [public_keys, key_que
 bind_links([Key], [key_delete])
 bind_links([KeyServerKey], [key_receive])
 
-register_setup(key_setup)
+#register_setup(key_setup)
diff --git a/apps/django_gpg/conf/__init__.py b/apps/django_gpg/conf/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/django_gpg/conf/settings.py b/apps/django_gpg/conf/settings.py
deleted file mode 100644
index e7a054b6ae..0000000000
--- a/apps/django_gpg/conf/settings.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Configuration options for the django_gpg app
-"""
-import os
-
-from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
-
-from smart_settings.api import Setting, SettingNamespace
-
-namespace = SettingNamespace('django_gpg', _(u'Signatures'), module='django_gpg.conf.settings', sprite='text_signature')
-
-Setting(
-    namespace=namespace,
-    name='KEYSERVERS',
-    global_name='SIGNATURES_KEYSERVERS',
-    default=['pool.sks-keyservers.net'],
-    description=_(u'List of keyservers to be queried for unknown keys.'),
-)
-
-Setting(
-    namespace=namespace,
-    name='GPG_HOME',
-    global_name='SIGNATURES_GPG_HOME',
-    default=os.path.join(settings.PROJECT_ROOT, u'gpg_home'),
-    description=_(u'Home directory used to store keys as well as configuration files.'),
-    exists=True,
-)
diff --git a/apps/django_gpg/icons.py b/apps/django_gpg/icons.py
new file mode 100644
index 0000000000..8993027d18
--- /dev/null
+++ b/apps/django_gpg/icons.py
@@ -0,0 +1,13 @@
+from __future__ import absolute_import
+
+from icons.literals import (DOCUMENT_SIGNATURE, KEY, KEY_DELETE, KEY_ADD,
+    ZOOM, LIGHTNING)
+from icons import Icon
+
+icon_private_keys = Icon(KEY)
+icon_public_keys = Icon(KEY)
+icon_key_delete = Icon(KEY_DELETE)
+icon_key_query = Icon(ZOOM)
+icon_key_receive = Icon(KEY_ADD)
+icon_key_setup = Icon(KEY)
+icon_document_signature = Icon(DOCUMENT_SIGNATURE)
diff --git a/apps/django_gpg/links.py b/apps/django_gpg/links.py
index 0bd30c276a..8508d1b477 100644
--- a/apps/django_gpg/links.py
+++ b/apps/django_gpg/links.py
@@ -4,12 +4,14 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation.api import Link
 
+from .icons import (icon_private_keys, icon_public_keys, icon_key_delete,
+    icon_key_query, icon_key_receive, icon_key_setup)
 from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE,
     PERMISSION_KEYSERVER_QUERY, PERMISSION_KEY_RECEIVE)
 
-private_keys = Link(text=_(u'private keys'), view='key_private_list', args='object.pk', sprite='key', icon='key.png', permissions=[PERMISSION_KEY_VIEW])
-public_keys = Link(text=_(u'public keys'), view='key_public_list', args='object.pk', sprite='key', icon='key.png', permissions=[PERMISSION_KEY_VIEW])
-key_delete = Link(text=_(u'delete'), view='key_delete', args=['object.fingerprint', 'object.type'], sprite='key_delete', permissions=[PERMISSION_KEY_DELETE])
-key_query = Link(text=_(u'query keyservers'), view='key_query', sprite='zoom', permissions=[PERMISSION_KEYSERVER_QUERY])
-key_receive = Link(text=_(u'import'), view='key_receive', args='object.keyid', sprite='key_add', keep_query=True, permissions=[PERMISSION_KEY_RECEIVE])
-key_setup = Link(text=_(u'key management'), view='key_public_list', args='object.pk', sprite='key', icon='key.png', permissions=[PERMISSION_KEY_VIEW], children_view_regex=[r'^key_'])
+private_keys = Link(text=_(u'private keys'), view='key_private_list', args='object.pk', icon=icon_private_keys, permissions=[PERMISSION_KEY_VIEW])
+public_keys = Link(text=_(u'public keys'), view='key_public_list', args='object.pk', icon=icon_private_keys, permissions=[PERMISSION_KEY_VIEW])
+key_delete = Link(text=_(u'delete'), view='key_delete', args=['object.fingerprint', 'object.type'], icon=icon_key_delete, permissions=[PERMISSION_KEY_DELETE])
+key_query = Link(text=_(u'query keyservers'), view='key_query', icon=icon_key_query, permissions=[PERMISSION_KEYSERVER_QUERY])
+key_receive = Link(text=_(u'import'), view='key_receive', args='object.keyid', icon=icon_key_receive, keep_query=True, permissions=[PERMISSION_KEY_RECEIVE])
+key_setup = Link(text=_(u'key management'), view='key_public_list', args='object.pk', icon=icon_key_setup, permissions=[PERMISSION_KEY_VIEW], children_view_regex=[r'^key_'])
diff --git a/apps/django_gpg/registry.py b/apps/django_gpg/registry.py
new file mode 100644
index 0000000000..ecd3aeb985
--- /dev/null
+++ b/apps/django_gpg/registry.py
@@ -0,0 +1,34 @@
+from __future__ import absolute_import
+
+import os
+
+from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
+
+from smart_settings import LocalScope
+
+from .icons import icon_document_signature
+from .links import key_setup
+
+name = 'django_gpg'
+label = _(u'GPG')
+description = _(u'Handles digital signatures.')
+icon = icon_document_signature
+dependencies = ['app_registry', 'permissions']
+setup_links = [key_setup]
+
+settings = [
+    {
+        'name': 'KEYSERVERS',
+        'default': ['pool.sks-keyservers.net'],
+        'description': _(u'List of keyservers to be queried for unknown keys.'),
+        'scopes': [LocalScope()],
+    },
+    {
+        'name': 'GPG_HOME',
+        'default': os.path.join(settings.PROJECT_ROOT, u'gpg_home'),
+        'description': _(u'Home directory used to store keys as well as configuration files.'),
+        'exists': True,
+        'scopes': [LocalScope()],
+    }
+]
diff --git a/apps/django_gpg/runtime.py b/apps/django_gpg/runtime.py
index 257ba8e3fd..ab38226c08 100644
--- a/apps/django_gpg/runtime.py
+++ b/apps/django_gpg/runtime.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
 import sys
 
 from .api import GPG
-from .conf.settings import KEYSERVERS, GPG_HOME
+from .settings import KEYSERVERS, GPG_HOME
 
 try:
     gpg = GPG(home=GPG_HOME, keyservers=KEYSERVERS)