diff --git a/apps/acls/__init__.py b/apps/acls/__init__.py
index 747916925a..185114abfa 100644
--- a/apps/acls/__init__.py
+++ b/apps/acls/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 from navigation.api import bind_links, register_multi_item_links
-from project_setup.api import register_setup
 
 from .classes import (AccessHolder, AccessObjectClass, ClassAccessHolder,
     AccessObject)
@@ -17,4 +16,3 @@ bind_links(['acl_setup_valid_classes', 'acl_class_acl_list', 'acl_class_new_hold
 bind_links([ClassAccessHolder], [acl_class_acl_detail])
 bind_links([AccessObjectClass], [acl_class_acl_list, acl_class_new_holder_for])
 register_multi_item_links(['acl_class_acl_detail'], [acl_class_grant, acl_class_revoke])
-register_setup(acl_setup_valid_classes)
diff --git a/apps/acls/icons.py b/apps/acls/icons.py
index a3020412a4..bd70416610 100644
--- a/apps/acls/icons.py
+++ b/apps/acls/icons.py
@@ -1,14 +1,10 @@
 from __future__ import absolute_import
 
-from icons.literals import LOCK
+from icons.literals import KEY, KEY_GO, KEY_ADD, KEY_DELETE, USER
 from icons import Icon
 
-icon_acl = Icon(LOCK)
-#icon_acl_detail = Icon(USER_ADD)
-#icon_acl_grant = Icon(USER_EDIT)
-#icon_acl_revoke = Icon(USER_DELETE)
-
-#icon_group = Icon(GROUP)
-#icon_group_add = Icon(GROUP_ADD)
-##icon_group_edit = Icon(GROUP_EDIT)
-#icon_group_delete = Icon(GROUP_DELETE)
+icon_acls = Icon(KEY)
+icon_acl_detail = Icon(KEY_GO)
+icon_acl_grant = Icon(KEY_ADD)
+icon_acl_revoke = Icon(KEY_DELETE)
+icon_acl_holder_new = Icon(USER)
diff --git a/apps/acls/links.py b/apps/acls/links.py
index fa7b612b36..9b3a076da8 100644
--- a/apps/acls/links.py
+++ b/apps/acls/links.py
@@ -6,15 +6,15 @@ from navigation.api import Link
 
 from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL,
     ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL)
-from .icons import icon_acl
+from .icons import icon_acls, icon_acl_detail, icon_acl_grant, icon_acl_revoke, icon_acl_holder_new
 
-acl_list = Link(text=_(u'ACLs'), view='acl_list', icon=icon_acl, permissions=[ACLS_VIEW_ACL])
-acl_detail = Link(text=_(u'details'), view='acl_detail', args=['access_object.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_VIEW_ACL])
-acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', sprite='key_add', permissions=[ACLS_EDIT_ACL])
-acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', sprite='key_delete', permissions=[ACLS_EDIT_ACL])
-acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', sprite='user', permissions=[ACLS_EDIT_ACL])
+acl_list = Link(text=_(u'ACLs'), view='acl_list', icon=icon_acls, permissions=[ACLS_VIEW_ACL])
+acl_detail = Link(text=_(u'details'), view='acl_detail', args=['access_object.gid', 'object.gid'], icon=icon_acl_detail, permissions=[ACLS_VIEW_ACL])
+acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', icon=icon_acl_grant, permissions=[ACLS_EDIT_ACL])
+acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', icon=icon_acl_revoke, permissions=[ACLS_EDIT_ACL])
+acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', icon=icon_acl_holder_new, permissions=[ACLS_EDIT_ACL])
 
-acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon=icon_acl, permissions=[ACLS_CLASS_VIEW_ACL])  # 'children_view_regex=[r'^acl_class', r'^acl_setup']}
+acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon=icon_acls, permissions=[ACLS_CLASS_VIEW_ACL])  # 'children_view_regex=[r'^acl_class', r'^acl_setup']}
 acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', sprite='package', permissions=[ACLS_CLASS_VIEW_ACL])
 acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', sprite='lock_go', permissions=[ACLS_CLASS_VIEW_ACL])
 acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_CLASS_VIEW_ACL])
diff --git a/apps/acls/registry.py b/apps/acls/registry.py
new file mode 100644
index 0000000000..e07003ab84
--- /dev/null
+++ b/apps/acls/registry.py
@@ -0,0 +1,13 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from .icons import icon_acls
+from .links import acl_setup_valid_classes
+
+name = 'acls'
+label = _(u'ACL')
+description = _(u'Handles object level access control.')
+icon = icon_acls
+setup_links = [acl_setup_valid_classes]
+dependencies = ['app_registry', 'permissions', 'navigation']
diff --git a/apps/app_registry/registry.py b/apps/app_registry/registry.py
index 93f8cba166..ee288c950e 100644
--- a/apps/app_registry/registry.py
+++ b/apps/app_registry/registry.py
@@ -10,3 +10,4 @@ label = _(u'App registry')
 description = _(u'Handles the registration of apps in a project.')
 icon = icon_app
 tool_links = [app_registry_tool_link]
+dependencies = ['navigation']
diff --git a/apps/converter/registry.py b/apps/converter/registry.py
index 74c54fb714..ffb3748d0b 100644
--- a/apps/converter/registry.py
+++ b/apps/converter/registry.py
@@ -14,7 +14,6 @@ icon = icon_format_list
 dependencies = ['app_registry']
 tool_links = [formats_list]
 
-
 settings = [
     {
         'name': 'IM_CONVERT_PATH',