diff --git a/mayan/apps/document_signatures/icons.py b/mayan/apps/document_signatures/icons.py
index ff762d5d8e..2cd7dc87ff 100644
--- a/mayan/apps/document_signatures/icons.py
+++ b/mayan/apps/document_signatures/icons.py
@@ -31,4 +31,3 @@ icon_document_version_signature_list = Icon(
 icon_document_version_signature_upload = Icon(
     driver_name='fontawesome', symbol='upload'
 )
-
diff --git a/mayan/apps/documents/icons.py b/mayan/apps/documents/icons.py
index 2625b1ee72..2aa67dea47 100644
--- a/mayan/apps/documents/icons.py
+++ b/mayan/apps/documents/icons.py
@@ -68,12 +68,23 @@ icon_document_type_create = Icon(driver_name='fontawesome', symbol='plus')
 icon_document_type_delete = Icon(driver_name='fontawesome', symbol='times')
 icon_document_type_edit = Icon(driver_name='fontawesome', symbol='pencil-alt')
 icon_document_type_setup = icon_document_type
+
 icon_document_type_filename = Icon(
     driver_name='fontawesome', symbol='keyboard'
 )
 icon_document_type_filename_create = Icon(
     driver_name='fontawesome', symbol='plus'
 )
+icon_document_type_filename_delete = Icon(
+    driver_name='fontawesome', symbol='times'
+)
+icon_document_type_filename_edit = Icon(
+    driver_name='fontawesome', symbol='pencil-alt'
+)
+icon_document_type_filename_list = Icon(
+    driver_name='fontawesome', symbol='keyboard'
+)
+
 icon_document_type_list = icon_document_type
 
 icon_favorite_document_add = Icon(
@@ -138,7 +149,7 @@ icon_document_type_filename = Icon(
 icon_document_type_filename_create = Icon(
     driver_name='fontawesome', symbol='plus'
 )
-icon_document_type_setup = Icon(driver_name='fontawesome', symbol='file')
+icon_document_type_setup = icon_document_type
 
 
 icon_document_version_download = Icon(
diff --git a/mayan/apps/motd/icons.py b/mayan/apps/motd/icons.py
index 4a1681c28d..b7c9b72e52 100644
--- a/mayan/apps/motd/icons.py
+++ b/mayan/apps/motd/icons.py
@@ -2,5 +2,10 @@ from __future__ import absolute_import, unicode_literals
 
 from mayan.apps.appearance.classes import Icon
 
-icon_message_create = Icon(driver_name='fontawesome', symbol='plus')
+icon_message_create = icon_tag_create = Icon(
+    driver_name='fontawesome-dual', primary_symbol='bullhorn',
+    secondary_symbol='plus'
+)
+icon_message_delete = Icon(driver_name='fontawesome', symbol='times')
+icon_message_edit = Icon(driver_name='fontawesome', symbol='pencil-alt')
 icon_message_list = Icon(driver_name='fontawesome', symbol='bullhorn')
diff --git a/mayan/apps/permissions/icons.py b/mayan/apps/permissions/icons.py
index 329033827b..ea29aea45c 100644
--- a/mayan/apps/permissions/icons.py
+++ b/mayan/apps/permissions/icons.py
@@ -2,5 +2,14 @@ from __future__ import absolute_import, unicode_literals
 
 from mayan.apps.appearance.classes import Icon
 
-icon_role_create = Icon(driver_name='fontawesome', symbol='plus')
+icon_group_roles = Icon(driver_name='fontawesome', symbol='user-secret')
+icon_permission = Icon(driver_name='fontawesome', symbol='thumbs-up')
+icon_role_create = Icon(
+    driver_name='fontawesome-dual', primary_symbol='user-secret',
+    secondary_symbol='plus'
+)
+icon_role_delete = Icon(driver_name='fontawesome', symbol='times')
+icon_role_edit = Icon(driver_name='fontawesome', symbol='pencil-alt')
+icon_role_groups = Icon(driver_name='fontawesome', symbol='users')
 icon_role_list = Icon(driver_name='fontawesome', symbol='user-secret')
+icon_role_permissions = Icon(driver_name='fontawesome', symbol='thumbs-up')
diff --git a/mayan/apps/user_management/icons.py b/mayan/apps/user_management/icons.py
index 0e94801dec..0ad7fddb47 100644
--- a/mayan/apps/user_management/icons.py
+++ b/mayan/apps/user_management/icons.py
@@ -4,7 +4,20 @@ from mayan.apps.appearance.classes import Icon
 
 icon_current_user_details = Icon(driver_name='fontawesome', symbol='user')
 icon_current_user_edit = Icon(driver_name='fontawesome', symbol='user')
+icon_group = Icon(driver_name='fontawesome', symbol='users')
 icon_group_create = Icon(driver_name='fontawesome', symbol='plus')
+icon_group_delete = Icon(driver_name='fontawesome', symbol='times')
+icon_group_edit = Icon(driver_name='fontawesome', symbol='pencil-alt')
+icon_group_list = Icon(driver_name='fontawesome', symbol='users')
+icon_group_user_list = Icon(driver_name='fontawesome', symbol='user')
 icon_group_setup = Icon(driver_name='fontawesome', symbol='users')
 icon_user_create = Icon(driver_name='fontawesome', symbol='plus')
+icon_user_delete = Icon(driver_name='fontawesome', symbol='times')
+icon_user_edit = Icon(driver_name='fontawesome', symbol='pencil-alt')
+icon_user_group_list = icon_group
+icon_user_list = Icon(driver_name='fontawesome', symbol='user')
+icon_user_multiple_delete = icon_user_delete
+icon_user_multiple_set_password = Icon(driver_name='fontawesome', symbol='key')
+icon_user_set_options = Icon(driver_name='fontawesome', symbol='cog')
+icon_user_set_password = Icon(driver_name='fontawesome', symbol='key')
 icon_user_setup = Icon(driver_name='fontawesome', symbol='user')