diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html
index b92eb13b04..4a7e32a575 100644
--- a/apps/common/templates/generic_list_subtemplate.html
+++ b/apps/common/templates/generic_list_subtemplate.html
@@ -36,15 +36,23 @@
                             {% if multi_select or multi_select_as_buttons %}
                                 <th class="first"><input type="checkbox" class="checkbox toggle" /></th>
                             {% endif %}
+
                             {% if not hide_object %}
                                 <th>{% trans "Identifier" %}</th>
                             {% endif %}
+
+                            {% for column in extra_columns_preffixed %}
+                                <th>{{ column.name|capfirst }}</th>
+                            {% endfor %}
+
                             {% for column in object_list.0|get_model_list_columns %}
                                 <th>{{ column.name|capfirst }}</th>
                             {% endfor %}            
+
                             {% for column in extra_columns %}
                                 <th>{{ column.name|capfirst }}</th>
                             {% endfor %}        
+
                             {% if not hide_links %}
                                 <th class="">&nbsp;</th>
                             {% endif %}
@@ -64,6 +72,15 @@
                                 <td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td>
                             {% endif %}
                         {% endif %}
+                        {% for column in extra_columns_preffixed %}
+                            {% if column.keep_together %}
+                                <td>
+                                    {{ object|object_property:column.attribute|safe|make_non_breakable }}
+                                </td>
+                            {% else %}
+                                <td>{{ object|object_property:column.attribute|safe }}</td>
+                            {% endif %}
+                        {% endfor %}                        
                         {% if not hide_columns %}
                             {% for column in object|get_model_list_columns %}
                                 <td>{{ object|object_property:column.attribute|safe }}</td>
diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py
index 52b63f1a73..206d3b8e5d 100644
--- a/apps/document_indexing/__init__.py
+++ b/apps/document_indexing/__init__.py
@@ -11,12 +11,12 @@ set_namespace_title('document_indexing', _(u'indexing'))
 register_permission(PERMISSION_DOCUMENT_INDEXING_VIEW)
 register_permission(PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES)
 
-index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': 'folder_link', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}
+index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}
 
 register_menu([
     {'text': _('indexes'), 'view': 'index_instance_list', 'links': [
     ], 'famfam': 'folder_link', 'position': 2, 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}])
 
-rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_link', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')}
+rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')}
 
 register_tool(rebuild_index_instances, namespace='document_indexing', title=_(u'Indexes'))
diff --git a/apps/document_indexing/views.py b/apps/document_indexing/views.py
index 068dfa7af3..ca53733ee2 100644
--- a/apps/document_indexing/views.py
+++ b/apps/document_indexing/views.py
@@ -15,6 +15,12 @@ from document_indexing.api import get_breadcrumbs, get_instance_link, \
     do_rebuild_all_indexes
 
 
+def _index_instance_item_link(index_instance_item):
+    icon = u'folder_page' if isinstance(index_instance_item, IndexInstance) else u'page'
+    return u'<span class="famfam active famfam-%(icon)s"></span><a href="%(url)s">%(text)s</a>' % {
+        'url': index_instance_item.get_absolute_url(), 'icon': icon, 'text': index_instance_item}
+
+    
 def index_instance_list(request, index_id=None):
     check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_VIEW])
 
@@ -33,8 +39,15 @@ def index_instance_list(request, index_id=None):
 
     return render_to_response('generic_list.html', {
         'object_list': index_instance_list,
+        'extra_columns_preffixed': [
+            {
+                'name': _(u'item'),
+                'attribute': lambda x: _index_instance_item_link(x)
+            }
+        ],
         'title': title,
         'hide_links': True,
+        'hide_object': True,
     }, context_instance=RequestContext(request))
 
 
@@ -48,8 +61,9 @@ def rebuild_index_instances(request):
         return render_to_response('generic_confirm.html', {
             'previous': previous,
             'next': next,
+            'title': _(u'Are you sure you wish to rebuild all indexes?'),
             'message': _(u'On large databases this operation may take some time to execute.'),
-            'form_icon': u'folder_link.png',
+            'form_icon': u'folder_page.png',
         }, context_instance=RequestContext(request))
     else:
         try:
diff --git a/site_media/images/icons/folder_link.png b/site_media/images/icons/folder_link.png
deleted file mode 100644
index 06e95f2cb5..0000000000
Binary files a/site_media/images/icons/folder_link.png and /dev/null differ
diff --git a/site_media/images/icons/folder_page.png b/site_media/images/icons/folder_page.png
new file mode 100644
index 0000000000..959fa1f1f3
Binary files /dev/null and b/site_media/images/icons/folder_page.png differ