diff --git a/public/main/exercise/admin.php b/public/main/exercise/admin.php
index fe93fe3607..0fb32af61c 100644
--- a/public/main/exercise/admin.php
+++ b/public/main/exercise/admin.php
@@ -302,7 +302,7 @@ if ($inATest) {
     }
     $actions .= '<a
         href="'.api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId().'&preview=1">'.
-        Display::getMdiIcon(ActionIcon::CONTENT_PREVIEW, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Preview')).'</a>';
+        Display::getMdiIcon(ActionIcon::PREVIEW_CONTENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Preview')).'</a>';
 
     $actions .= Display::url(
         Display::getMdiIcon('chart-box', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Results and feedback')),
diff --git a/public/main/exercise/exercise_submit.php b/public/main/exercise/exercise_submit.php
index 5e5b8a7d73..f9115838f9 100644
--- a/public/main/exercise/exercise_submit.php
+++ b/public/main/exercise/exercise_submit.php
@@ -1494,7 +1494,7 @@ if ($allowBlockCategory &&
                 success: function(return_value) {
                     if (return_value.ok) {
                         $("#save_for_now_"+question_id).html(\''.
-                        Display::getMdiIcon(ActionIcon::FORM_SAVE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Saved')).'\');
+                        Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Saved')).'\');
                 } else if (return_value.error) {
                         $("#save_for_now_"+question_id).html(\''.
                             Display::getMdiIcon('alert-circle', 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Error')).'\');
@@ -1520,7 +1520,7 @@ if ($allowBlockCategory &&
                         }
 
                         $("#save_for_now_"+question_id).html(\''.
-                        Display::getMdiIcon(ActionIcon::FORM_SAVE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Saved')).'\' + return_value.savedAnswerMessage);
+                        Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Saved')).'\' + return_value.savedAnswerMessage);
 
                     // Show popup
                     if ("check_answers" === url_extra) {
diff --git a/public/main/forum/viewforumcategory.php b/public/main/forum/viewforumcategory.php
index f672225977..c5cc8b84b9 100755
--- a/public/main/forum/viewforumcategory.php
+++ b/public/main/forum/viewforumcategory.php
@@ -146,7 +146,7 @@ if (api_is_allowed_to_edit(false, true)) {
     }
 
     $actionLeft .= Display::url(
-        Display::getMdiIcon(ActionIcon::FOLDER_CREATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add a forumCategory')),
+        Display::getMdiIcon(ActionIcon::CREATE_FOLDER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add a forumCategory')),
         api_get_self().'?'.api_get_cidreq().'&action=add_category&lp_id='.$lp_id
     );
 }
diff --git a/public/main/gradebook/lib/fe/displaygradebook.php b/public/main/gradebook/lib/fe/displaygradebook.php
index 71ce345b07..74939625d2 100644
--- a/public/main/gradebook/lib/fe/displaygradebook.php
+++ b/public/main/gradebook/lib/fe/displaygradebook.php
@@ -32,7 +32,7 @@ class DisplayGradebook
 
                     if (api_is_platform_admin() || false == $evalobj->is_locked()) {
                         $links[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&selecteval='.$evalobj->get_id().'&import=">'.
-                            Display::getMdiIcon(ActionIcon::ARCHIVE_IMPORT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Import marks')).'</a>';
+                            Display::getMdiIcon(ActionIcon::IMPORT_ARCHIVE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Import marks')).'</a>';
                     }
 
                     if ($evalobj->has_results()) {
@@ -395,7 +395,7 @@ class DisplayGradebook
             }
             if ((empty($grade_model_id) || -1 == $grade_model_id) && $accessToEdit) {
                 $actionsLeft .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.
-                    Display::getMdiIcon(ActionIcon::FOLDER_CREATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add assessment')).'</a></td>';
+                    Display::getMdiIcon(ActionIcon::CREATE_FOLDER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add assessment')).'</a></td>';
             }
 
             if ('0' != $selectcat && $accessToRead) {
diff --git a/src/CoreBundle/Component/Utils/ActionIcon.php b/src/CoreBundle/Component/Utils/ActionIcon.php
index c2d0a4edc9..f096384d31 100644
--- a/src/CoreBundle/Component/Utils/ActionIcon.php
+++ b/src/CoreBundle/Component/Utils/ActionIcon.php
@@ -25,13 +25,13 @@ enum ActionIcon: string
     // Go back one page
     case BACK = 'arrow-left-bold-box';
     // Assign groups of users to some resource
-    case ASSIGN_GROUP_USERS_TO_RESOURCE = 'account-multiple-plus';
+    case SUBSCRIBE_GROUP_USERS_TO_RESOURCE = 'account-multiple-plus';
     // Handle to move an element by drag & drop
     case MOVE_DRAG_DROP = 'cursor-move';
     // Move backward one page (learning paths)
-    case LP_MOVE_BACKWARD = 'chevron-left';
+    case MOVE_LP_BACKWARD = 'chevron-left';
     // Move forward one page (learning paths)
-    case LP_MOVE_FORWARD = 'chevron-right';
+    case MOVE_LP_FORWARD = 'chevron-right';
     // Move something up
     case UP = 'arrow-up-bold';
     // Move something down or show some unfolded interface component
@@ -41,9 +41,9 @@ enum ActionIcon: string
     // Preview some content
     case CONTENT_PREVIEW = 'magnify-plus-outline';
     // Import some kind of archive/packaged
-    case ARCHIVE_IMPORT = 'archive-arrow-up';
+    case IMPORT_ARCHIVE = 'archive-arrow-up';
     // Create a category
-    case CATEGORY_CREATE = 'folder-multiple-plus';
+    case CREATE_CATEGORY = 'folder-multiple-plus';
     // Create a folder
     case FOLDER_CREATE = 'folder-plus';
     // Alert the user of something important/unexpected/undesired
@@ -57,13 +57,13 @@ enum ActionIcon: string
     // Invisible state
     case INVISIBLE = 'eye-off';
     // Hide from course homepage (unpublish)
-    case COURSE_TOOL_UNPUBLISHED = 'checkbox-multiple-blank';
+    case UNPUBLISH_COURSE_TOOL = 'checkbox-multiple-blank';
     // Show on course homepage
-    case COURSE_TOOL_PUBLISHED = 'checkbox-multiple-blank-outline';
+    case PUBLISH_COURSE_TOOL = 'checkbox-multiple-blank-outline';
     // Disable multiple attempts (or show multiple attempts are currently enabled)
-    case MULTIPLE_ATTEMPTS_DISABLE = 'sync';
+    case DISABLE_MULTIPLE_ATTEMPTS = 'sync';
     // Enable multiple attempts (or show multiple attempts are currently disabled)
-    case MULTIPLE_ATTEMPTS_ENABLE = 'sync-circle';
+    case ENABLE_MULTIPLE_ATTEMPTS = 'sync-circle';
     // Display mode 1
     case DISPLAY_MODE_1 = 'fullscreen';
     // Display mode 2
@@ -71,17 +71,17 @@ enum ActionIcon: string
     // Display mode 3
     case LP_DISPLAY_MODE_3 = 'overscan';
     // Display mode 4
-    case LP_DISPLAY_4 = 'play-box-outline';
+    case LP_DISPLAY_MODE_4 = 'play-box-outline';
     // Equivalent to fullscreen-exit?
-    case LP_FULLSCREEN_EXIT = 'fit-to-screen';
+    case EXIT_LP_FULLSCREEN = 'fit-to-screen';
     // Enable debug
-    case DEBUG_ENABLE = 'bug-check';
+    case ENABLE_DEBUG = 'bug-check';
     // Disable debug
-    case DEBUG_DISABLE = 'bug-outline';
+    case DISABLE_DEBUG = 'bug-outline';
     // Export in some type of archive/package
-    case ARCHIVE_EXPORT = 'archive-arrow-down';
+    case EXPORT_ARCHIVE = 'archive-arrow-down';
     // Copy content
-    case CONTENT_COPY = 'text-box-plus';
+    case COPY_CONTENT = 'text-box-plus';
     // Enable/Disable auto-launch of some content
     case AUTO_LAUNCH = 'rocket-launch';
     // Export to PDF
@@ -95,9 +95,9 @@ enum ActionIcon: string
     // Save the current form
     case FORM_SAVE = 'content-save';
     // Send a message
-    case MESSAGE_SEND = 'send';
+    case SEND_MESSAGE = 'send';
     // Add an attachment
-    case ATTACHMENT_ADD = 'paperclip-plus';
+    case ADD_ATTACHMENT = 'paperclip-plus';
     // ?
     //case CLOUD_UPLOAD = 'cloud-upload';
     // Three vertical dots to indicate the possibility to extend a menu/set of options
@@ -113,11 +113,11 @@ enum ActionIcon: string
     // Print
     case PRINT = 'printer';
     // See details/View details
-    case DETAILS = 'fast-forward-outline';
+    case VIEW_DETAILS = 'fast-forward-outline';
     // Clean/Reset
     case RESET = 'broom';
     // Add audio
-    case AUDIO_ADD = 'music-note-plus';
+    case ADD_AUDIO = 'music-note-plus';
     // Collapse/Contract
     case COLLAPSE = 'arrow-collapse-all';
     // Expand
@@ -130,4 +130,6 @@ enum ActionIcon: string
     case UNLOCK = 'lock-open-variant';
     // Refresh/reload
     case REFRESH = 'file-document-refresh';
+    // Add user
+    case ADD_USER = 'account-plus';
 }