diff --git a/apps/acls/icons.py b/apps/acls/icons.py
index 795d0dd03e..5cb26d96f2 100644
--- a/apps/acls/icons.py
+++ b/apps/acls/icons.py
@@ -1,19 +1,20 @@
 from __future__ import absolute_import
 
-from icons.literals import (KEY, KEY_GO, KEY_ADD, KEY_DELETE, LOCK, USER,
+from icons.literals import (KEY, KEY_GO, KEY_ADD, KEY_DELETE, LOCK, USER_ADD,
     PACKAGE, LOCK_GO)
 from icons import Icon
 
+icon_acl_app = Icon(LOCK)
+
 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)
-icon_acl_app = Icon(LOCK)
+icon_acl_holder_new = Icon(USER_ADD)
 
 icon_acl_class_list = Icon(PACKAGE)
 icon_acl_class_acl_list = Icon(LOCK_GO)
 icon_acl_class_acl_detail = Icon(KEY_GO)
-icon_acl_class_new_holder_for = Icon(USER)
+icon_acl_class_new_holder_for = Icon(USER_ADD)
 icon_acl_class_grant = Icon(KEY_ADD)
 icon_acl_class_revoke = Icon(KEY_DELETE)
diff --git a/apps/acls/links.py b/apps/acls/links.py
index 3ae2b41c43..56aea8e40f 100644
--- a/apps/acls/links.py
+++ b/apps/acls/links.py
@@ -17,7 +17,7 @@ acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', icon=icon_acl_gran
 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_acls, 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_acl_class_list, 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', icon=icon_acl_class_list, permissions=[ACLS_CLASS_VIEW_ACL])
 acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', icon=icon_acl_class_acl_list, 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'], icon=icon_acl_class_acl_detail, permissions=[ACLS_CLASS_VIEW_ACL])