diff --git a/mayan/apps/main/static/images/icons/delete.png b/mayan/apps/main/static/images/icons/delete.png
deleted file mode 100644
index 30a45b821c..0000000000
Binary files a/mayan/apps/main/static/images/icons/delete.png and /dev/null differ
diff --git a/mayan/apps/main/static/main/icons/application_form.png b/mayan/apps/main/static/main/icons/application_form.png
new file mode 100644
index 0000000000..bc6a856185
Binary files /dev/null and b/mayan/apps/main/static/main/icons/application_form.png differ
diff --git a/mayan/apps/main/static/main/icons/blackboard_sum.png b/mayan/apps/main/static/main/icons/blackboard_sum.png
new file mode 100644
index 0000000000..43ad0ab130
Binary files /dev/null and b/mayan/apps/main/static/main/icons/blackboard_sum.png differ
diff --git a/mayan/apps/main/static/main/icons/book.png b/mayan/apps/main/static/main/icons/book.png
new file mode 100644
index 0000000000..45c9edfe2f
Binary files /dev/null and b/mayan/apps/main/static/main/icons/book.png differ
diff --git a/mayan/apps/main/static/main/icons/cog.png b/mayan/apps/main/static/main/icons/cog.png
new file mode 100644
index 0000000000..d53ebf1c3d
Binary files /dev/null and b/mayan/apps/main/static/main/icons/cog.png differ
diff --git a/mayan/apps/main/static/main/icons/disconnect.png b/mayan/apps/main/static/main/icons/disconnect.png
new file mode 100644
index 0000000000..93b5c0c0d1
Binary files /dev/null and b/mayan/apps/main/static/main/icons/disconnect.png differ
diff --git a/mayan/apps/main/static/main/icons/group.png b/mayan/apps/main/static/main/icons/group.png
new file mode 100644
index 0000000000..bea24889d1
Binary files /dev/null and b/mayan/apps/main/static/main/icons/group.png differ
diff --git a/mayan/apps/main/static/main/icons/interface_preferences.png b/mayan/apps/main/static/main/icons/interface_preferences.png
new file mode 100644
index 0000000000..60026f35b8
Binary files /dev/null and b/mayan/apps/main/static/main/icons/interface_preferences.png differ
diff --git a/mayan/apps/main/static/main/icons/key.png b/mayan/apps/main/static/main/icons/key.png
new file mode 100644
index 0000000000..3cf460e112
Binary files /dev/null and b/mayan/apps/main/static/main/icons/key.png differ
diff --git a/mayan/apps/main/static/images/icons/keyboard.png b/mayan/apps/main/static/main/icons/keyboard.png
similarity index 100%
rename from mayan/apps/main/static/images/icons/keyboard.png
rename to mayan/apps/main/static/main/icons/keyboard.png
diff --git a/mayan/apps/main/static/main/icons/layout.png b/mayan/apps/main/static/main/icons/layout.png
new file mode 100644
index 0000000000..2b2bb814c2
Binary files /dev/null and b/mayan/apps/main/static/main/icons/layout.png differ
diff --git a/mayan/apps/main/static/main/icons/link.png b/mayan/apps/main/static/main/icons/link.png
new file mode 100644
index 0000000000..b0c35b59a3
Binary files /dev/null and b/mayan/apps/main/static/main/icons/link.png differ
diff --git a/mayan/apps/main/static/main/icons/lock.png b/mayan/apps/main/static/main/icons/lock.png
new file mode 100644
index 0000000000..ceebba9df3
Binary files /dev/null and b/mayan/apps/main/static/main/icons/lock.png differ
diff --git a/mayan/apps/main/static/main/icons/medal_gold_red.png b/mayan/apps/main/static/main/icons/medal_gold_red.png
new file mode 100644
index 0000000000..92c13c9a6d
Binary files /dev/null and b/mayan/apps/main/static/main/icons/medal_gold_red.png differ
diff --git a/mayan/apps/main/static/images/icons/pill.png b/mayan/apps/main/static/main/icons/pill.png
similarity index 100%
rename from mayan/apps/main/static/images/icons/pill.png
rename to mayan/apps/main/static/main/icons/pill.png
diff --git a/mayan/apps/main/static/images/icons/question.png b/mayan/apps/main/static/main/icons/question.png
similarity index 100%
rename from mayan/apps/main/static/images/icons/question.png
rename to mayan/apps/main/static/main/icons/question.png
diff --git a/mayan/apps/main/static/main/icons/tab.png b/mayan/apps/main/static/main/icons/tab.png
new file mode 100644
index 0000000000..0bff3c4d63
Binary files /dev/null and b/mayan/apps/main/static/main/icons/tab.png differ
diff --git a/mayan/apps/main/static/main/icons/text.png b/mayan/apps/main/static/main/icons/text.png
new file mode 100644
index 0000000000..e5be01e347
Binary files /dev/null and b/mayan/apps/main/static/main/icons/text.png differ
diff --git a/mayan/apps/main/static/main/icons/user.png b/mayan/apps/main/static/main/icons/user.png
new file mode 100644
index 0000000000..42b381070c
Binary files /dev/null and b/mayan/apps/main/static/main/icons/user.png differ
diff --git a/mayan/apps/main/static/images/icons/wrench.png b/mayan/apps/main/static/main/icons/wrench.png
similarity index 100%
rename from mayan/apps/main/static/images/icons/wrench.png
rename to mayan/apps/main/static/main/icons/wrench.png
diff --git a/mayan/apps/main/static/main/icons/xhtml.png b/mayan/apps/main/static/main/icons/xhtml.png
new file mode 100644
index 0000000000..a1b9bd0d1c
Binary files /dev/null and b/mayan/apps/main/static/main/icons/xhtml.png differ
diff --git a/mayan/apps/navigation/widgets.py b/mayan/apps/navigation/widgets.py
index 7841e897ff..607a1c4c9d 100644
--- a/mayan/apps/navigation/widgets.py
+++ b/mayan/apps/navigation/widgets.py
@@ -39,7 +39,7 @@ def render_widget(request, link):
     links = resolve_links(context, [link], current_view, current_path, parsed_query_string)
     if links:
         link = links[0]
-        return mark_safe(u'<a style="text-decoration:none; margin-right: 10px;" href="%(url)s"><button style="vertical-align: top; padding: 1px; width: 110px; height: 100px; margin: 10px;"><img src="%(static_url)simages/icons/%(icon)s" alt="%(image_alt)s" /><p style="margin: 0px 0px 0px 0px;">%(string)s</p></button></a>' % {
+        return mark_safe(u'<a style="text-decoration:none; margin-right: 10px;" href="%(url)s"><button style="vertical-align: top; padding: 1px; width: 110px; height: 100px; margin: 10px;"><img src="%(static_url)smain/icons/%(icon)s" alt="%(image_alt)s" /><p style="margin: 0px 0px 0px 0px;">%(string)s</p></button></a>' % {
             'url': reverse(link['view']) if 'view' in link else link['url'],
             'icon': link.get('icon', 'link_button.png'),
             'static_url': settings.STATIC_URL,
diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py
index 5d48224464..825b58389d 100644
--- a/mayan/apps/permissions/links.py
+++ b/mayan/apps/permissions/links.py
@@ -13,6 +13,6 @@ permission_revoke = {'text': _(u'Revoke'), 'view': 'permissions:permission_multi
 role_create = {'text': _(u'Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]}
 role_delete = {'text': _(u'Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]}
 role_edit = {'text': _(u'Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]}
-role_list = {'text': _(u'Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']}
+role_list = {'text': _(u'Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_red.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']}
 role_members = {'text': _(u'Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]}
 role_permissions = {'text': _(u'Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]}