diff --git a/apps/document_indexing/icons.py b/apps/document_indexing/icons.py
index 7e09bbdde9..d9742d44b4 100644
--- a/apps/document_indexing/icons.py
+++ b/apps/document_indexing/icons.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from icons.literals import (FOLDER_PAGE, TAB, TAB_ADD, TAB_EDIT,
-    TAB_DELETE, TAB_VIEW, INDEX, NODE, TEXTFIELD, TEXTFIELD_DELETE,
-    ARROW_UP)
+from icons.literals import (FOLDER, FOLDER_PAGE, TAB, TAB_ADD, TAB_EDIT,
+    TAB_DELETE, INDEX, NODE_TREE, NODE_TREE_ADD, NODE_TREE_EDIT,
+    NODE_TREE_DELETE, ARROW_UP, LAYOUT, BULLET_GO)
 from icons import Icon
 
 icon_index_setup = Icon(TAB)
@@ -10,15 +10,19 @@ icon_index_setup_list = Icon(TAB)
 icon_index_setup_create = Icon(TAB_ADD)
 icon_index_setup_edit = Icon(TAB_EDIT)
 icon_index_setup_delete = Icon(TAB_DELETE)
-icon_index_setup_view = Icon(TAB_VIEW)
-icon_index_setup_document_types = Icon(INDEX)
+icon_index_setup_view = Icon(NODE_TREE)
+icon_index_setup_document_types = Icon(LAYOUT)
 
-icon_template_node_create = Icon(NODE)
-icon_template_node_edit = Icon(TEXTFIELD)
-icon_template_node_delete = Icon(TEXTFIELD_DELETE)
+icon_template_node_create = Icon(NODE_TREE_ADD)
+icon_template_node_edit = Icon(NODE_TREE_EDIT)
+icon_template_node_delete = Icon(NODE_TREE_DELETE)
 
 icon_index_list = Icon(TAB)
 icon_index_parent = Icon(ARROW_UP)
 icon_document_index_list = Icon(FOLDER_PAGE)
 
 icon_rebuild_index_instances = Icon(FOLDER_PAGE)
+
+icon_folder = Icon(FOLDER)
+icon_folder_with_document = Icon(FOLDER_PAGE)
+icon_next_level = Icon(BULLET_GO)
diff --git a/apps/document_indexing/links.py b/apps/document_indexing/links.py
index f3a1801f6e..0553f8158a 100644
--- a/apps/document_indexing/links.py
+++ b/apps/document_indexing/links.py
@@ -19,8 +19,8 @@ from .icons import (icon_index_setup, icon_index_setup_list, icon_index_setup_cr
     icon_index_parent, icon_document_index_list, icon_rebuild_index_instances)
 
 
-def is_root_node(context):
-    return context['node'].parent is None
+def is_not_root_node(context):
+    return context['node'].parent is not None
 
 
 def is_not_instance_root_node(context):
@@ -37,8 +37,8 @@ index_setup_view = Link(text=_(u'tree template'), view='index_setup_view', args=
 index_setup_document_types = Link(text=_(u'document types'), view='index_setup_document_types', args='index.pk', icon=icon_index_setup_document_types, permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT])  # children_view_regex=[r'^index_setup', r'^template_node'])
 
 template_node_create = Link(text=_(u'new child node'), view='template_node_create', args='node.pk', icon=icon_template_node_create, permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT])
-template_node_edit = Link(text=_(u'edit'), view='template_node_edit', args='node.pk', icon=icon_template_node_edit, permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT], conditional_disable=is_root_node)
-template_node_delete = Link(text=_(u'delete'), view='template_node_delete', args='node.pk', icon=icon_template_node_delete, permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT], conditional_disable=is_root_node)
+template_node_edit = Link(text=_(u'edit'), view='template_node_edit', args='node.pk', icon=icon_template_node_edit, permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT], condition=is_not_root_node)
+template_node_delete = Link(text=_(u'delete'), view='template_node_delete', args='node.pk', icon=icon_template_node_delete, permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT], condition=is_not_root_node)
 
 index_list = Link(text=_(u'index list'), view='index_list', icon=icon_index_list, permissions=[PERMISSION_DOCUMENT_INDEXING_VIEW])