Display: Use new icons in various tools

public/main/inc/lib/TicketManager.php

@@ -13,6 +13,7 @@ use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CLp;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 /**
  * Class TicketManager.
@@ -2288,17 +2289,17 @@ class TicketManager
     public static function getSettingsMenuItems($exclude = null)
     {
         $project = [
-            'icon' => 'project.png',
+            'icon' => ObjectIcon::PROJECT,
             'url' => 'projects.php',
             'content' => get_lang('Projects'),
         ];
         $status = [
-            'icon' => 'check-circle.png',
+            'icon' => StateIcon::COMPLETE,
             'url' => 'status.php',
             'content' => get_lang('Status'),
         ];
         $priority = [
-            'icon' => 'tickets_urgent.png',
+            'icon' => StateIcon::EXPIRED,
             'url' => 'priorities.php',
             'content' => get_lang('Priority'),
         ];

public/main/inc/lib/diagnoser.lib.php

@@ -4,6 +4,7 @@
 
 use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 /**
  * Class Diagnoser
@@ -928,21 +929,21 @@ class Diagnoser
     ) {
         switch ($status) {
             case self::STATUS_OK:
-                $img = 'bullet_green.png';
+                $img = StateIcon::COMPLETE;
                 break;
             case self::STATUS_WARNING:
-                $img = 'bullet_orange.png';
+                $img = StateIcon::WARNING;
                 break;
             case self::STATUS_ERROR:
-                $img = 'bullet_red.png';
+                $img = StateIcon::ERROR;
                 break;
             case self::STATUS_INFORMATION:
             default:
-                $img = 'bullet_blue.png';
+                $img = ActionIcon::INFORMATION;
                 break;
         }
 
-        $image = Display::return_icon($img, $status);
+        $image = Display::getMdiIcon($img, 'ch-tool-icon', null, ICON_SIZE_SMALL, $title);
         $url = $this->get_link($title, $url);
 
         $formatted_current_value = $current_value;

public/main/inc/lib/exercise_show_functions.lib.php

@@ -3,6 +3,7 @@
 
 use Chamilo\CoreBundle\Entity\TrackEExercise;
 use Chamilo\CoreBundle\Framework\Container;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 class ExerciseShowFunctions
 {
@@ -376,12 +377,33 @@ class ExerciseShowFunctions
                 break;
         }
 
-        $icon = in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION]) ? 'radio' : 'checkbox';
-        $icon .= $studentChoice ? '_on' : '_off';
-        $icon .= '.png';
-        $iconAnswer = in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION]) ? 'radio' : 'checkbox';
-        $iconAnswer .= $answerCorrect ? '_on' : '_off';
-        $iconAnswer .= '.png';
+        if (in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION])) {
+            if ($studentChoice) {
+                $icon = StateIcon::RADIOBOX_MARKED;
+            } else {
+                $icon = StateIcon::RADIOBOX_BLANK;
+            }
+        } else {
+            if ($studentChoice) {
+                $icon = StateIcon::CHECKBOX_MARKED;
+            } else {
+                $icon = StateIcon::CHECKBOX_BLANK;
+            }
+        }
+        if (in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION])) {
+            if ($answerCorrect) {
+                $iconAnswer = StateIcon::RADIOBOX_MARKED;
+            } else {
+                $iconAnswer = StateIcon::RADIOBOX_BLANK;
+            }
+        } else {
+            if ($answerCorrect) {
+                $iconAnswer = StateIcon::CHECKBOX_MARKED;
+            } else {
+                $iconAnswer = StateIcon::CHECKBOX_BLANK;
+            }
+
+        }
 
         $studentChoiceClass = '';
         if (in_array(
@@ -399,22 +421,22 @@ class ExerciseShowFunctions
 
         echo '<tr class="'.$studentChoiceClass.'">';
 
-        echo '<td width="5%">';
-        echo Display::return_icon($icon, null, null, ICON_SIZE_TINY);
+        echo '<td style="width:5%">';
+        echo Display::getMdiIcon($icon, 'ch-tool-icon', null, ICON_SIZE_TINY);
         echo '</td>';
         if ($exercise->showExpectedChoiceColumn()) {
             if (false === $hide_expected_answer) {
-                echo '<td width="5%">';
-                echo Display::return_icon($iconAnswer, null, null, ICON_SIZE_TINY);
+                echo '<td style="width:5%">';
+                echo Display::getMdiIcon($iconAnswer, 'ch-tool-icon', null, ICON_SIZE_TINY);
                 echo '</td>';
             } else {
-                echo '<td width="5%">';
+                echo '<td style="width:5%">';
                 echo '-';
                 echo '</td>';
             }
         }
 
-        echo '<td width="40%">';
+        echo '<td style="width:40%">';
         echo $answer;
         echo '</td>';
 
@@ -438,7 +460,7 @@ class ExerciseShowFunctions
 
         if (false === $exercise->hideComment) {
             if ($showComment) {
-                echo '<td width="20%">';
+                echo '<td style="width:20%">';
                 $color = 'black';
                 if ($answerCorrect) {
                     $color = 'green';
@@ -463,14 +485,17 @@ class ExerciseShowFunctions
      * Display the answers to a multiple choice question.
      *
      * @param Exercise $exercise
-     * @param int Answer type
-     * @param int Student choice
-     * @param string  Textual answer
-     * @param string  Comment on answer
-     * @param string  Correct answer comment
-     * @param int Exercise ID
-     * @param int Question ID
-     * @param bool Whether to show the answer comment or not
+     * @param int $feedbackType Feedback type
+     * @param int $answerType Answer type
+     * @param int $studentChoice Student choice
+     * @param string  $answer Textual answer
+     * @param string  $answerComment Comment on answer
+     * @param string  $answerCorrect Correct answer comment
+     * @param int $id Exercise ID
+     * @param int $questionId Question ID
+     * @param bool $ans Whether to show the answer comment or not
+     * @param int $resultsDisabled
+     * @param bool $showTotalScoreAndUserChoices
      */
     public static function display_multiple_answer_true_false(
         $exercise,

public/main/lp/learnpath.class.php

@@ -29,6 +29,7 @@ use Doctrine\Common\Collections\Criteria;
 use PhpZip\ZipFile;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 /**
  * Class learnpath
@@ -6602,7 +6603,7 @@ class learnpath
 
         <ul class="mt-2 bg-white list-group lp_resource">
             <li class="list-group-item lp_resource_element disable_drag ">
-                '.Display::return_icon('linksnew.gif').'
+                '.Display::getMdiIcon(ObjectIcon::LINK, 'ch-tool-icon', null, ICON_SIZE_SMALL).'
                 <a
                 href="'.api_get_path(WEB_CODE_PATH).'link/link.php?'.$courseIdReq.'&action=addlink&lp_id='.$this->lp_id.'"
                 title="'.get_lang('Add a link').'">'.

public/main/lp/lp_build.php

@@ -6,6 +6,8 @@ exit;
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 /**
  * This is a learning path creation and player tool in Chamilo - previously learnpath_handler.php.
@@ -66,13 +68,13 @@ if (isset($is_success) && true === $is_success) {
         'lp_controller.php?'.api_get_cidreq().'&action=add_item&type=step&lp_id='.$learnPath->get_id(),
         get_lang("Add learning object or activity"),
         get_lang('Add learning object or activityComment'),
-        'tools.png'
+        ObjectIcon::RESOURCE
     );
     $rightColumn .= show_block(
         'lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnPath->get_id(),
         get_lang("Ranking"),
         get_lang('RankingComment'),
-        'view.png'
+        ActionIcon::PREVIEW_CONTENT
     );
     $rightColumn .= '</ul>';
 }
@@ -90,7 +92,7 @@ function show_block($link, $title, $subtitle, $icon)
     $html = '<li class="col-md-4">';
     $html .= '<div class="thumbnail">';
     $html .= '<a href="'.$link.'" title="'.$title.'">';
-    $html .= Display::return_icon($icon, $title, [], ICON_SIZE_BIG);
+    $html .= Display::getMdiIcon($icon, 'ch-tool-icon', null, ICON_SIZE_BIG, $title);
     $html .= '</a>';
     $html .= '<div class="caption">';
     $html .= '<strong>'.$title.'</strong></a> '.$subtitle;

public/main/my_space/work_stats.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../inc/global.inc.php';
 
 api_protect_course_script();
@@ -151,7 +153,7 @@ function get_users($from, $number_of_items, $column, $direction)
 
         $row[] = $status;
         /*$detailsLink = Display::url(
-            Display::return_icon('2rightarrow.png', get_lang('Details').' '.$studentData['username']),
+            Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details').' '.$studentData['username']),
             $urlDetails,
             ['id' => 'details_'.$studentData['username']]
         );

public/main/search/load_search.php

@@ -4,6 +4,7 @@
 
 use Chamilo\CoreBundle\Entity\ExtraFieldSavedSearch;
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $cidReset = true;
 
@@ -1013,19 +1014,21 @@ $actionLinks = 'function action_formatter(cellvalue, options, rowObject) {
     var id = options.rowId.toString();
     if (sessionList.indexOf(id) == -1) {
         return \'<a href="'.api_get_self(
-    ).'?action=subscribe_user&user_id='.$userToLoad.'&session_id=\'+id+\'">'.Display::return_icon(
-        'add.png',
-        addslashes(get_lang('Subscribe')),
-        '',
-        ICON_SIZE_SMALL
+    ).'?action=subscribe_user&user_id='.$userToLoad.'&session_id=\'+id+\'">'.Display::getMdiIcon(
+        ActionIcon::ADD,
+        'ch-tool-icon',
+        null,
+        ICON_SIZE_SMALL,
+        addslashes(get_lang('Subscribe'))
     ).'</a>'.'\';
     } else {
         return \'<a href="'.api_get_self(
-    ).'?action=unsubscribe_user&user_id='.$userToLoad.'&session_id=\'+id+\'">'.Display::return_icon(
-        'delete.png',
-        addslashes(get_lang('Delete')),
-        '',
-        ICON_SIZE_SMALL
+    ).'?action=unsubscribe_user&user_id='.$userToLoad.'&session_id=\'+id+\'">'.Display::getMdiIcon(
+        ActionIcon::DELETE,
+        'ch-tool-icon',
+        null,
+        ICON_SIZE_SMALL,
+        addslashes(get_lang('Delete'))
     ).'</a>'.'\';
     }
 }';

public/main/session/add_edit_users_to_session.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 $cidReset = true;
 
@@ -591,26 +592,26 @@ if ($ajax_search) {
 if ('multiple' == $add_type) {
     $link_add_type_unique =
         '<a href="'.api_get_self().'?id_session='.$sessionId.'&add='.$addProcess.'&add_type=unique">'.
-        Display::return_icon('single.gif').get_lang('Single registration').'</a>';
-    $link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('Multiple registration'), '');
+        Display::getMdiIcon(ObjectIcon::SINGLE_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Single registration')).get_lang('Single registration').'</a>';
+    $link_add_type_multiple = Display::url(Display::getMdiIcon(ObjectIcon::MULTI_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Multiple registration')).get_lang('Multiple registration'), '');
 } else {
-    $link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('Single registration'), '');
+    $link_add_type_unique = Display::url(Display::getMdiIcon(ObjectIcon::SINGLE_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Single registration')).get_lang('Single registration'), '');
     $link_add_type_multiple =
         '<a href="'.api_get_self().'?id_session='.$sessionId.'&amp;add='.$addProcess.'&amp;add_type=multiple">'
-        .Display::return_icon('multiple.gif').get_lang('Multiple registration').'</a>';
+        .Display::getMdiIcon(ObjectIcon::MULTI_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Multiple registration')).get_lang('Multiple registration').'</a>';
 }
 $link_add_group = Display::url(
-    Display::return_icon('multiple.gif', get_lang('Enrolment by classes')).get_lang('Enrolment by classes'),
+    Display::getMdiIcon(ObjectIcon::MULTI_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Enrolment by classes')).get_lang('Enrolment by classes'),
     api_get_path(WEB_CODE_PATH).'admin/usergroups.php'
 );
 
 $newLinks = Display::url(
-    Display::return_icon('teacher.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY).
+    Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_TINY, get_lang('Enroll trainers from existing sessions')).
         get_lang('Enroll trainers from existing sessions'),
     api_get_path(WEB_CODE_PATH).'session/add_teachers_to_session.php?id='.$sessionId
 );
 $newLinks .= Display::url(
-    Display::return_icon('user.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY).
+    Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_TINY, get_lang('Enroll trainers from existing sessions')).
         get_lang('Enroll students from existing sessions'),
     api_get_path(WEB_CODE_PATH).'session/add_students_to_session.php?id='.$sessionId
 );

public/main/session/add_users_to_session.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 // resetting the course id
 $cidReset = true;
 
@@ -75,17 +77,17 @@ if ($form->validate()) {
 Display::display_header($tool_name);
 
 $link_add_group = Display::url(
-    Display::return_icon('multiple.gif', get_lang('Enrolment by classes')).get_lang('Enrolment by classes'),
+    Display::getMdiIcon(ObjectIcon::MULTI_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Enrolment by classes')).get_lang('Enrolment by classes'),
     api_get_path(WEB_CODE_PATH).'admin/usergroups.php'
 );
 
 $newLinks = Display::url(
-    Display::return_icon('teacher.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY).
+    Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_TINY, get_lang('Enroll trainers from existing sessions')).
     get_lang('Enroll trainers from existing sessions'),
     api_get_path(WEB_CODE_PATH).'session/add_teachers_to_session.php?id='.$sessionId
 );
 $newLinks .= Display::url(
-    Display::return_icon('user.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY).
+    Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_TINY, get_lang('Enroll trainers from existing sessions')).
     get_lang('Enroll students from existing sessions'),
     api_get_path(WEB_CODE_PATH).'session/add_students_to_session.php?id='.$sessionId
 );

public/main/session/add_users_to_session_course.php

@@ -3,6 +3,7 @@
 
 // resetting the course id
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 $cidReset = true;
 
@@ -638,13 +639,13 @@ if ($ajax_search) {
 if ('multiple' == $add_type) {
     $link_add_type_unique =
         '<a href="'.api_get_self().'?course_id='.$courseId.'&id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
-        Display::return_icon('single.gif').get_lang('Single registration').'</a>';
-    $link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('Multiple registration'), '');
+        Display::getMdiIcon(ObjectIcon::SINGLE_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Single registration')).get_lang('Single registration').'</a>';
+    $link_add_type_multiple = Display::url(Display::getMdiIcon(ObjectIcon::MULTI_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Multiple registration')).get_lang('Multiple registration'), '');
 } else {
-    $link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('Single registration'), '');
+    $link_add_type_unique = Display::url(Display::getMdiIcon(ObjectIcon::SINGLE_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Single registration')).get_lang('Single registration'), '');
     $link_add_type_multiple =
         '<a href="'.api_get_self().'?course_id='.$courseId.'&id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'
-        .Display::return_icon('multiple.gif').get_lang('Multiple registration').'</a>';
+        .Display::getMdiIcon(ObjectIcon::MULTI_ELEMENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Multiple registration')).get_lang('Multiple registration').'</a>';
 }
 
 echo Display::toolbarAction('users_to_session', [$link_add_type_unique.$link_add_type_multiple]);

public/main/session/index.php

@@ -3,6 +3,8 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 /**
  * @author Julio Montoya <gugli100@gmail.com>  Beeznest
@@ -144,11 +146,11 @@ if (!empty($courseList)) {
         foreach ($lp_list as $item) {
             if (empty($item['modified_on'])) {
                 $lp_date_original = $item['created_on'];
-                $image = 'new.gif';
+                $image = ObjectIcon::STAR_EMPTY;
                 $label = get_lang('Course added');
             } else {
                 $lp_date_original = $item['modified_on'];
-                $image = 'moderator_star.png';
+                $image = ObjectIcon::STAR;
                 $label = get_lang('Learning path updated');
             }
 
@@ -160,8 +162,11 @@ if (!empty($courseList)) {
 
             if (strtotime($last_date) < strtotime($lp_date_original)) {
                 if (empty($icons)) {
-                    $icons .= ' '.Display::return_icon(
+                    $icons .= ' '.Display::getMdiIcon(
                         $image,
+                        'ch-tool-icon',
+                        null,
+                        ICON_SIZE_SMALL,
                         get_lang('Since your latest visit').': '.$label.' - '.$lp_date_original
                     ).' ';
                 }
@@ -295,10 +300,12 @@ if (!empty($courseList)) {
                     );
 
                     $new_exercises[] = [
-                        'status' => Display::return_icon(
-                            'star.png',
-                            get_lang('New'),
-                            ['width' => ICON_SIZE_SMALL]
+                        'status' => Display::getMdiIcon(
+                            ObjectIcon::STAR_EMPTY,
+                            'ch-tool-icon',
+                            null,
+                            ICON_SIZE_SMALL,
+                            get_lang('New')
                         ),
                         'date' => $exerciseInfo['start_time'],
                         'course' => $courseInfo['title'],
@@ -340,11 +347,12 @@ if (!empty($courseList)) {
                     );
 
                     $my_real_array[] = [
-                        'status' => Display::return_icon(
-                            'quiz.png',
-                            get_lang('Attempted'),
-                            '',
-                            ICON_SIZE_SMALL
+                        'status' => Display::getMdiIcon(
+                            ObjectIcon::TEST,
+                            'ch-tool-icon',
+                            null,
+                            ICON_SIZE_SMALL,
+                            get_lang('Attempted')
                         ),
                         'date' => $start_date,
                         'course' => $courseInfo['title'],
@@ -376,7 +384,7 @@ if ($session->getDuration() > 0) {
 $editLink = '';
 if (api_is_platform_admin()) {
     $editLink = '&nbsp;'.Display::url(
-        Display::return_icon('edit.png', get_lang('Edit')),
+        Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')),
         api_get_path(WEB_CODE_PATH).'session/session_edit.php?page=resume_session.php&id='.$session_id
     );
 }
@@ -623,7 +631,7 @@ if (!api_is_anonymous()) {
 
 // Main headers
 $headers = [
-    Display::return_icon('moderator_star.png'),
+    Display::getMdiIcon(ObjectIcon::STAR, 'ch-tool-icon', null, ICON_SIZE_SMALL),
     get_lang('Courses'),
     get_lang('Learning paths'),
 ];

public/main/session/resume_session.php

@@ -8,6 +8,9 @@ use Chamilo\CoreBundle\Entity\SessionRelCourse;
 use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\SequenceRepository;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -108,13 +111,13 @@ switch ($action) {
 }
 
 $sessionHeader = Display::page_header(
-    Display::getMdiIcon('google-classroom', 'ch-tool-icon-gradient', null, 32, get_lang('Session')).' '.$session->getName(),
+    Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon-gradient', null, 32, get_lang('Session')).' '.$session->getName(),
     null,
     'h3'
 );
 
 $url = Display::url(
-    Display::getMdiIcon('pencil', 'ch-tool-icon-gradient', null, 32, get_lang('Edit')),
+    Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon-gradient', null, 32, get_lang('Edit')),
     "session_edit.php?page=resume_session.php&id=$sessionId"
 );
 
@@ -130,7 +133,7 @@ if ($isMultipleUrl) {
 }
 
 $url = Display::url(
-    Display::getMdiIcon('plus', 'ch-tool-icon-gradient', null, 32, get_lang('Add')),
+    Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon-gradient', null, 32, get_lang('Add')),
     "add_courses_to_session.php?page=resume_session.php&id_session=$sessionId"
 );
 $courseListToShow = Display::page_subheader(get_lang('Course list').$url);
@@ -176,8 +179,11 @@ if (0 === $session->getNbrCourses()) {
         $orderButtons = '';
         if (SessionManager::orderCourseIsEnabled()) {
             $orderButtons = Display::url(
-                Display::return_icon(
-                    !$count ? 'up_na.png' : 'up.png',
+                Display::getMdiIcon(
+                    ActionIcon::UP,
+                    !$count ? 'ch-tool-icon-disabled' : 'ch-tool-icon',
+                    null,
+                    ICON_SIZE_SMALL,
                     get_lang('Move up')
                 ),
                 !$count
@@ -186,8 +192,11 @@ if (0 === $session->getNbrCourses()) {
             );
 
             $orderButtons .= Display::url(
-                Display::return_icon(
-                    $count + 1 == count($courses) ? 'down_na.png' : 'down.png',
+                Display::getMdiIcon(
+                    ActionIcon::DOWN,
+                    $count + 1 == count($courses) ? 'ch-tool-icon-disabled' : 'ch-tool-icon',
+                    null,
+                    ICON_SIZE_SMALL,
                     get_lang('Move down')
                 ),
                 $count + 1 == count($courses)
@@ -210,7 +219,7 @@ if (0 === $session->getNbrCourses()) {
         $courseItem .= '<td>'.($namesOfCoaches ? implode('<br>', $namesOfCoaches) : get_lang('none')).'</td>';
         $courseItem .= '<td>'.$numberOfUsers.'</td>';
         $courseItem .= '<td>';
-        $courseItem .= Display::url(Display::getMdiIcon('home', 'ch-tool-icon', null, 22, get_lang('Course')), $courseUrl);
+        $courseItem .= Display::url(Display::getMdiIcon(ObjectIcon::HOME, 'ch-tool-icon', null, 22, get_lang('Course')), $courseUrl);
 
         if ($allowSkills) {
             $courseItem .= Display::url(
@@ -221,7 +230,7 @@ if (0 === $session->getNbrCourses()) {
         $courseItem .= $orderButtons;
 
         $courseItem .= Display::url(
-            Display::getMdiIcon('account-multiple-plus', 'ch-tool-icon', null, 22, get_lang('Add a user')),
+            Display::getMdiIcon(ActionIcon::ADD_USER, 'ch-tool-icon', null, 22, get_lang('Add a user')),
             $codePath."session/add_users_to_session_course.php?id_session=$sessionId&course_id=".$courseId
         );
         $courseItem .= Display::url(
@@ -241,13 +250,13 @@ if (0 === $session->getNbrCourses()) {
             $codePath."tracking/courseLog.php?sid=$sessionId&cid={$courseId}$orig_param&hide_course_breadcrumb=1"
         );
         $courseItem .= Display::url(
-            Display::getMdiIcon('human-male-board', 'ch-tool-icon', null, 22, get_lang('Edit coach')),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, 22, get_lang('Edit coach')),
             $codePath."session/session_course_edit.php?id_session=$sessionId&page=resume_session.php&course_code={$courseCode}$orig_param"
         );
 
         // @todo
         /*$courseItem .= Display::url(
-            Display::return_icon('folder_document.png', get_lang('File upload')),
+            Display::getMdiIcon(ActionIcon::UPLOAD, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('File upload')),
             '#',
             [
                 'class' => 'session-upload-file-btn',
@@ -256,7 +265,7 @@ if (0 === $session->getNbrCourses()) {
             ]
         );*/
         $courseItem .= Display::url(
-            Display::getMdiIcon('delete', 'ch-tool-icon', null, 22, get_lang('Delete')),
+            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, 22, get_lang('Delete')),
             api_get_self()."?id_session=$sessionId&action=delete&idChecked[]={$courseCode}",
             [
                 'onclick' => "javascript:if(!confirm('".get_lang('Please confirm your choice')."')) return false;",
@@ -271,7 +280,7 @@ if (0 === $session->getNbrCourses()) {
 $courseListToShow .= '</table><br />';
 
 $url = '&nbsp;'.Display::url(
-        Display::getMdiIcon('plus', 'ch-tool-icon-gradient', null, 32, get_lang('Add')),
+        Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon-gradient', null, 32, get_lang('Add')),
     $codePath."session/add_users_to_session.php?page=resume_session.php&id_session=$sessionId"
 );
 $url .= Display::url(
@@ -315,7 +324,7 @@ if (!empty($sessionRelUsers)) {
         );
 
         $removeLink = Display::url(
-            Display::getMdiIcon('delete', 'ch-tool-icon', null, 22, get_lang('Delete')),
+            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, 22, get_lang('Delete')),
             api_get_self().'?id_session='.$sessionId.'&action=delete&user='.$userId,
             ['onclick' => "javascript:if(!confirm('".get_lang('Please confirm your choice')."')) return false;"]
         );
@@ -323,8 +332,8 @@ if (!empty($sessionRelUsers)) {
         $addUserToUrlLink = '';
         /*if ($isMultipleUrl) {
             if ($user['access_url_id'] != $url_id) {
-                $userLink .= ' '.Display::return_icon('warning.png', get_lang('Users not added to the URL'));
-                $add = Display::return_icon('add.png', get_lang('Add a userToURL'));
+                $userLink .= ' '.Display::getMdiIcon(StateIcon::WARNING, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Users not added to the URL'));
+                $add = Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add a userToURL'));
                 $addUserToUrlLink = '<a href="resume_session.php?action=add_user_to_url&id_session='.$sessionId
                     .'&user_id='.$user['user_id'].'">'.$add.'</a>';
             }
@@ -335,7 +344,7 @@ if (!empty($sessionRelUsers)) {
         if (isset($sessionInfo['duration']) && !empty($sessionInfo['duration'])) {
             $editUrl = $codePath . 'session/session_user_edit.php?session_id=' . $sessionId . '&user_id=' . $userId;
             $editUrl = Display::url(
-                Display::return_icon('agenda.png', get_lang('Edit session duration')),
+                Display::getMdiIcon(ObjectIcon::AGENDA, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit session duration')),
                 $editUrl
             );
         }*/
@@ -344,7 +353,7 @@ if (!empty($sessionRelUsers)) {
             case Session::DRH:
                 $status = get_lang('Human Resources Manager');
                 $link = Display::url(
-                    Display::getMdiIcon('pencil', 'ch-tool-icon', null, 22, get_lang('Edit')),
+                    Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, 22, get_lang('Edit')),
                     $codePath.'admin/dashboard_add_sessions_to_user.php?user='.$userId
                 );
                 break;

public/main/session/scheduled_announcement.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -105,7 +107,7 @@ switch ($action) {
         } else {
             $content = '<div class="actions">';
             $content .= Display::url(
-                Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM),
+                Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')),
                 api_get_self().'?session_id='.$sessionId
             );
             $content .= '</div>';
@@ -197,8 +199,8 @@ $columnModel = [
 ];
 
 $actionLinks = 'function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="?action=edit&session_id='.$sessionId.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("Please confirm your choice"), ENT_QUOTES))."\'".')) return false;"  href="?action=delete&session_id='.$sessionId.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="?action=edit&session_id='.$sessionId.'&id=\'+options.rowId+\'">'.Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("Please confirm your choice"), ENT_QUOTES))."\'".')) return false;"  href="?action=delete&session_id='.$sessionId.'&id=\'+options.rowId+\'">'.Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'</a>'.
     '\';
 }';
 

public/main/session/session_add.php

@@ -5,6 +5,7 @@
 use Chamilo\CoreBundle\Entity\Asset;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $cidReset = true;
 
@@ -348,7 +349,7 @@ if (!empty($return)) {
 }
 
 $actions = '<a href="../session/session_list.php">'.
-    Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Administration'), [], ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to').' '.get_lang('Administration')).'</a>';
 echo Display::toolbarAction('session', [$actions]);
 $form->display();
 

public/main/session/session_course_list.php

@@ -1,6 +1,8 @@
 <?php
 
 /* For licensing terms, see /license.txt */
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 $cidReset = true;
 
@@ -86,11 +88,11 @@ foreach ($Courses as $key => $enreg) {
     $course[] = api_htmlentities($enreg['title'], ENT_QUOTES);
     $course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
     $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
-        Display::return_icon('course_home.png', get_lang('Course')).'</a>
+        Display::getMdiIcon(ObjectIcon::HOME, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Course')).'</a>
 			<a href="session_course_edit.php?id_session='.$id_session.'&page=session_course_list.php&course_code='.$enreg['code'].'">'.
-        Display::return_icon('edit.png', get_lang('Edit')).'</a>
+        Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a>
 			<a href="'.api_get_self().'?id_session='.$id_session.'&sort='.$sort.'&action=delete&idChecked[]='.$enreg['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("Please confirm your choice"), ENT_QUOTES)).'\')) return false;">'.
-        Display::return_icon('delete.png', get_lang('Delete')).'</a>';
+        Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'</a>';
     $tableCourses[] = $course;
 }
 echo '<form method="post" action="'.api_get_self().'">';

public/main/session/session_course_user_list.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -209,14 +211,14 @@ echo Display::page_header($tool_name);
                     ?>
                             <a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=<?php echo $sort; ?>&action=delete&idChecked[]=<?php echo $enreg['user_id']; ?>"
                                onclick="javascript:if(!confirm('<?php echo get_lang('Please confirm your choice'); ?>')) return false;">
-                                <?php echo Display::return_icon('delete.png', get_lang('Delete')); ?>
+                                <?php echo Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')); ?>
                             </a>
                         <?php
                 } else {
                     ?>
                             <a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=<?php echo $sort; ?>&action=add&idChecked[]=<?php echo $enreg['user_id']; ?>"
                                onclick="javascript:if(!confirm('<?php echo get_lang('Please confirm your choice'); ?>')) return false;">
-                                <?php echo Display::return_icon('add.png', get_lang('Add'), [], ICON_SIZE_SMALL); ?>
+                                <?php echo Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add')); ?>
                             </a>
                         <?php
                 } ?>

public/main/session/session_export.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $cidReset = true;
 
@@ -294,7 +295,7 @@ $result = Database::query($sql);
 $Sessions = Database::store_result($result);
 
 $actions = '<a href="../session/session_list.php">'.
-        Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Session list'), '', ICON_SIZE_MEDIUM).'</a>';
+        Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to').' '.get_lang('Session list')).'</a>';
 echo Display::toolbarAction('toolbar', [$actions]);
 
 if (!empty($errorMsg)) {

public/main/session/session_import.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $cidReset = true;
 
@@ -532,7 +533,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
 
 Display::display_header($toolName);
 $actions = '<a href="../session/session_list.php">'.
-    Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Administration'), '', ICON_SIZE_MEDIUM).
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to').' '.get_lang('Administration')).
     '</a>';
 echo Display::toolbarAction('session_import', [$actions]);
 

public/main/session/session_import_drh.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -22,7 +24,7 @@ $inserted_in_course = [];
 Display::display_header($tool_name);
 
 $actions = '<a href="../session/session_list.php">'.
-    Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Administration'), '', ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to').' '.get_lang('Administration')).'</a>';
 
 echo Display::toolbarAction('toolbar', [$actions]);
 

public/main/session/session_list_custom.php

@@ -5,6 +5,9 @@
 /**
  * List sessions in an efficient and usable way.
  */
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -118,15 +121,15 @@ $hideSearch = ('true' === api_get_setting('session.hide_search_form_in_session_l
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
      return \'<a href="session_edit.php?page=resume_session.php&id=\'+options.rowId+\'">'.
-    Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
+    Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a>'.
     '&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.
-    Display::return_icon('user_subscribe_session.png', get_lang('SubscribeUsersToSession'), '', ICON_SIZE_SMALL).'</a>'.
+    Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('SubscribeUsersToSession')).'</a>'.
     '&nbsp;<a href="add_courses_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.
-    Display::return_icon('courses_to_session.png', get_lang('SubscribeCoursesToSession'), '', ICON_SIZE_SMALL).'</a>'.
+    Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('SubscribeCoursesToSession')).'</a>'.
     '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("Please confirm your choice"), ENT_QUOTES))."\'".')) return false;" href="session_list.php?list_type='.$listType.'&action=copy&idChecked=\'+options.rowId+\'">'.
-    Display::return_icon('copy.png', get_lang('Copy'), '', ICON_SIZE_SMALL).'</a>'.
+    Display::getMdiIcon(ActionIcon::COPY_CONTENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Copy')).'</a>'.
     '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("Please confirm your choice"), ENT_QUOTES))."\'".')) return false;" href="session_list.php?list_type='.$listType.'&action=delete&idChecked=\'+options.rowId+\'">'.
-    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
+    Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'</a>'.
     '\';
 }';
 
@@ -313,12 +316,12 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
 <?php
 
 echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.
-    Display::return_icon('new_session.png', get_lang('AddSession'), '', ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('AddSession')).'</a>';
 if (api_is_platform_admin()) {
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.
-        Display::return_icon('session_to_category.png', get_lang('AddSessionsInCategories'), '', ICON_SIZE_MEDIUM).'</a>';
+        Display::getMdiIcon(ActionIcon::CREATE_CATEGORY, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('AddSessionsInCategories')).'</a>';
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.
-        Display::return_icon('folder.png', get_lang('ListSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>';
+        Display::getMdiIcon(ObjectIcon::CATEGORY, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ListSessionCategory')).'</a>';
 }
 
 echo $actions;

public/main/session/session_user_import.php

@@ -1,6 +1,7 @@
 <?php
 
 /* For licensing terms, see /license.txt */
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $cidReset = true;
 
@@ -65,7 +66,7 @@ Display::display_header($tool_name);
 
 echo '<div class="actions">';
 echo '<a href="resume_session.php?id_session='.$session_id.'">'.
-    Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Administration'), '', ICON_SIZE_MEDIUM).
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to').' '.get_lang('Administration')).
     '</a>';
 echo '</div>';
 

public/main/social/group_members.php

@@ -5,6 +5,9 @@
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -121,9 +124,7 @@ $social_right_content = '<h2>'.$group_info['name'].'</h2>';
 foreach ($users as $user) {
     switch ($user['relation_type']) {
         case GROUP_USER_PERMISSION_ADMIN:
-            $user['link'] = Display::return_icon(
-                'social_group_admin.png',
-                get_lang('Admin')
+            $user['link'] = Display::getMdiIcon(ObjectIcon::ADMIN_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Admin')
             );
             break;
         case GROUP_USER_PERMISSION_READER:
@@ -136,35 +137,25 @@ foreach ($users as $user) {
             )
             ) {
                 $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete">'.
-                    Display::return_icon(
-                        'delete.png',
-                        get_lang('Delete from group')
+                    Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete from group')
                     ).'</a>'.
                     '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=set_moderator">'.
-                    Display::return_icon(
-                        'social_moderator_add.png',
-                        get_lang('Add as moderator')
+                    Display::getMdiIcon(ActionIcon::ADD_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add as moderator')
                     ).'</a>';
             }
             break;
         case GROUP_USER_PERMISSION_PENDING_INVITATION:
             $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=add">'.
-                Display::return_icon(
-                    'pending_invitation.png',
-                    get_lang('Pending invitation')
+                Display::getMdiIcon(ObjectIcon::PENDING_INVITATION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Pending invitation')
                 ).'</a>';
             break;
         case GROUP_USER_PERMISSION_MODERATOR:
-            $user['link'] = Display::return_icon(
-                'social_group_moderator.png',
-                get_lang('Moderator')
+            $user['link'] = Display::getMdiIcon(ObjectIcon::MODERATOR_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Moderator')
             );
             //only group admin can manage moderators
             if (GROUP_USER_PERMISSION_ADMIN == $user_role) {
                 $user['link'] .= '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete_moderator">'.
-                    Display::return_icon(
-                        'social_moderator_delete.png',
-                        get_lang('Remove moderator')
+                    Display::getMdiIcon('account-voice-off', 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Remove moderator')
                     ).'</a>';
             }
             break;

public/main/social/group_view.php

@@ -5,6 +5,9 @@
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -193,7 +196,7 @@ if ($is_group_member || GROUP_PERMISSION_OPEN == $groupInfo['visibility']) {
             $social_right_content .= '<a
                 class="btn btn--plain btn-sm"
                 href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
-                    Display::getMdiIcon('email').' '.
+                    Display::getMdiIcon(ObjectIcon::EMAIL).' '.
                 get_lang('You have been invited to join now').'</a>';
         }
         $social_right_content .= '</div>';
@@ -259,7 +262,7 @@ if ($is_group_member || GROUP_PERMISSION_OPEN == $groupInfo['visibility']) {
             $member_content .= '<div class="group-tool">';
             $member_content .= '<div class="pull-right">';
             $member_content .= Display::url(
-                Display::getMdiIcon('pencil').' '.get_lang('Edit members list'),
+                Display::getMdiIcon(ActionIcon::EDIT).' '.get_lang('Edit members list'),
                 'group_members.php?id='.$group_id,
                 ['class' => 'btn btn--plain btn-sm', 'title' => get_lang('Edit members list')]
             );
@@ -276,9 +279,9 @@ if ($is_group_member || GROUP_PERMISSION_OPEN == $groupInfo['visibility']) {
             )) {
                 //add icons
                 if (GROUP_USER_PERMISSION_ADMIN == $member['relation_type']) {
-                    $icon = Display::return_icon('social_group_admin.png', get_lang('Admin'));
+                    $icon = Display::getMdiIcon(ObjectIcon::ADMIN_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Admin'));
                 } elseif (GROUP_USER_PERMISSION_MODERATOR == $member['relation_type']) {
-                    $icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
+                    $icon = Display::getMdiIcon(ObjectIcon::MODERATOR_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Moderator'));
                 } else {
                     $icon = '';
                 }

public/main/social/group_waiting_list.php

@@ -5,6 +5,9 @@
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjetIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -92,11 +95,11 @@ foreach ($users as $user) {
     switch ($user['relation_type']) {
         case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
             $user['link'] = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$userId.'&action=accept">'.
-                Display::return_icon('invitation_friend.png', get_lang('Add as simple user')).'</a>';
+                Display::getMdiIcon(ActionIcon::ADD_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add as simple user')).'</a>';
             $user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$userId.'&action=set_moderator">'.
-                Display::return_icon('social_moderator_add.png', get_lang('Add as moderator')).'</a>';
+                Display::getMdiIcon(ObjectIcon::MODERATOR_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Add as moderator')).'</a>';
             $user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$userId.'&action=deny">'.
-                Display::return_icon('user_delete.png', get_lang('Deny access')).'</a>';
+                Display::getMdiIcon('account-cancel', 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Deny access')).'</a>';
             break;
     }
     $new_member_list[] = $user;

public/main/social/groups.php

@@ -5,6 +5,8 @@
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  */
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -64,16 +66,20 @@ if (is_array($results) && count($results) > 0) {
         $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
 
         if (GROUP_USER_PERMISSION_ADMIN == $result['relation_type']) {
-            $name .= ' '.Display::return_icon(
-                'social_group_admin.png',
-                get_lang('Admin'),
-                ['style' => 'vertical-align:middle']
+            $name .= ' '.Display::getMdiIcon(
+                ObjectIcon::ADMIN_USER,
+                'ch-tool-icon',
+                'vertical-align:middle;',
+                ICON_SIZE_SMALL,
+                get_lang('Admin')
             );
         } elseif (GROUP_USER_PERMISSION_MODERATOR == $result['relation_type']) {
-            $name .= ' '.Display::return_icon(
-                'social_group_moderator.png',
-                get_lang('Moderator'),
-                ['style' => 'vertical-align:middle']
+            $name .= ' '.Display::getMdiIcon(
+                ObjectIcon::MODERATOR_USER,
+                'ch-tool-icon',
+                'vertical-align:middle;',
+                ICON_SIZE_SMALL,
+                get_lang('Moderator')
             );
         }
         $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';

public/main/social/new_promoted_message.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -224,7 +226,7 @@ $social_right_content .= '<div class="row">';
 $social_right_content .= '<div class="col-md-12">';
 $social_right_content .= '<div class="actions">';
 $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-    Display::return_icon('back.png', get_lang('Back'), [], 32).'</a>';
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')).'</a>';
 $social_right_content .= '</div>';
 $social_right_content .= '</div>';
 $social_right_content .= '<div class="col-md-12">';

public/main/social/personal_data.php

@@ -4,6 +4,7 @@
 
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\LegalRepository;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $cidReset = true;
 
@@ -368,11 +369,11 @@ if ('true' === api_get_setting('allow_terms_conditions')) {
         $userId,
         'legal_accept'
     );
-    $permissionBlock .= Display::return_icon('accept_na.png', get_lang('Rejected'));
+    $permissionBlock .= Display::getMdiIcon(ActionIcon::REJECT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Rejected'));
     if (isset($value['value']) && !empty($value['value'])) {
         [$legalId, $legalLanguageId, $legalTime] = explode(':', $value['value']);
         $permissionBlock = '<h4>'.get_lang('Current status').'</h4>'.
-            get_lang('Legal agreement accepted').' '.Display::return_icon('accept.png', get_lang('Legal agreement accepted'), [], ICON_SIZE_TINY).
+            get_lang('Legal agreement accepted').' '.Display::getMdiIcon(ActionIcon::ACCEPT, 'ch-tool-icon', null, ICON_SIZE_TINY, get_lang('Legal agreement accepted')).
             '<br />';
         $permissionBlock .= get_lang('Date').': '.api_get_local_time($legalTime).'<br /><br />';
         $permissionBlock .= $formToString;
@@ -427,7 +428,7 @@ if (!empty($officerName)) {
 $tpl = new Template(null);
 
 $actions = Display::url(
-    Display::return_icon('excel.png', get_lang('Export'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Export')),
     api_get_path(WEB_CODE_PATH).'social/personal_data.php?export=1'
 );
 

public/main/social/profile_friends_and_groups.inc.php

@@ -9,6 +9,7 @@
  */
 
 use Chamilo\CoreBundle\Entity\UserRelUser;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -78,16 +79,20 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
                 $icon = '';
                 $name = cut($result['name'], 20, true);
                 if (GROUP_USER_PERMISSION_ADMIN == $result['relation_type']) {
-                    $icon = Display::return_icon(
-                        'social_group_admin.png',
-                        get_lang('Admin'),
-                        ['style' => 'vertical-align:middle;width:16px;height:16px;']
+                    $icon = Display::getMdiIcon(
+                        ObjectIcon::ADMIN_USER,
+                        'ch-tool-icon',
+                        'vertical-align:middle;',
+                        ICON_SIZE_TINY,
+                        get_lang('Admin')
                     );
                 } elseif (GROUP_USER_PERMISSION_MODERATOR == $result['relation_type']) {
-                    $icon = Display::return_icon(
-                        'social_group_moderator.png',
-                        get_lang('Moderator'),
-                        ['style' => 'vertical-align:middle;width:16px;height:16px;']
+                    $icon = Display::getMdiIcon(
+                        ObjectIcon::MODERATOR_USER,
+                        'ch-tool-icon',
+                        'vertical-align:middle;',
+                        ICON_SIZE_TINY,
+                        get_lang('Moderator')
                     );
                 }
                 $count_users_group = count(

public/main/social/promoted_messages.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -35,7 +37,7 @@ $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('List')];
 $social_right_content = '';
 $keyword = '';
 $actionsLeft = '<a href="'.api_get_path(WEB_CODE_PATH).'social/new_promoted_message.php">'.
-    Display::return_icon('new-message.png', get_lang('Compose message'), [], 32).'</a>';
+    Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Compose message')).'</a>';
 
 $form = MessageManager::getSearchForm(api_get_self());
 if ($form->validate()) {

public/main/social/terms.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -52,7 +54,7 @@ if ($allowSocial) {
 $tpl = new Template(null);
 
 $actions = Display::url(
-    Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')),
     api_get_path(WEB_CODE_PATH).'social/personal_data.php'
 );
 

public/main/ticket/categories.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 /**
  * This script is the Tickets plugin main entry point.
@@ -161,19 +162,19 @@ function modify_filter($id, $params, $row)
     $result = '';
     if ('true' === api_get_setting('ticket_allow_category_edition')) {
         $result .= Display::url(
-            Display::return_icon('edit.png', get_lang('Edit')),
+            Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')),
             "categories.php?action=edit&id={$row['id']}&project_id=".$projectId
         );
     }
 
     $result .= Display::url(
-        Display::return_icon('user.png', get_lang('Assign user')),
+        Display::getMdiIcon(ActionIcon::ADD_USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Assign user')),
         "categories_add_user.php?id={$row['id']}&project_id=".$projectId
     );
 
     if ('true' === api_get_setting('ticket_allow_category_edition')) {
         $result .= Display::url(
-            Display::return_icon('delete.png', get_lang('Delete')),
+            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
             "categories.php?action=delete&id={$row['id']}&project_id=".$projectId
         );
     }
@@ -193,7 +194,7 @@ Display::display_header($toolName);
 $items = [
     [
         'url' => 'categories.php?action=add&project_id='.$projectId,
-        'content' => Display::return_icon('new_folder.png', null, null, ICON_SIZE_MEDIUM),
+        'content' => Display::getMdiIcon(ActionIcon::CREATE_FOLDER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM),
     ],
 ];
 

public/main/ticket/new_ticket.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../inc/global.inc.php';
 
 if (!api_is_platform_admin() && 'true' !== api_get_setting('ticket_allow_student_add')) {
@@ -346,7 +348,7 @@ Display::display_header(get_lang('Compose message'));
 
 echo '<div class="actions">';
 echo Display::url(
-    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Tickets')),
     api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
 );
 echo '</div>';

public/main/ticket/priorities.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 /**
  * This script is the Tickets plugin main entry point.
@@ -129,7 +130,7 @@ $isAdmin = api_is_platform_admin();
 function modify_filter($id, $params, $row)
 {
     $result = Display::url(
-        Display::return_icon('edit.png', get_lang('Edit')),
+        Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')),
         api_get_self()."?action=edit&id={$row['id']}"
     );
 
@@ -137,7 +138,7 @@ function modify_filter($id, $params, $row)
 
     if (!in_array($code, TicketManager::getDefaultPriorityList())) {
         $result .= Display::url(
-            Display::return_icon('delete.png', get_lang('Delete')),
+            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
             api_get_self()."?action=delete&id={$row['id']}"
         );
     }
@@ -160,14 +161,14 @@ $items = [
 ];
 
 $actions = Display::url(
-    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Tickets')),
     api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
 );
 $sections = TicketManager::getSettingsMenuItems('priority');
 array_unshift($sections, $items);
 foreach ($sections as $item) {
     $actions .= Display::url(
-        Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon($item['icon'], 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $item['content']),
         $item['url']
     );
 }

public/main/ticket/projects.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 /**
  * This script is the Tickets plugin main entry point.
@@ -144,12 +145,12 @@ function modify_filter($id, $params, $row)
     );
 
     $result .= Display::url(
-        Display::return_icon('edit.png', get_lang('Edit')),
+        Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')),
         "projects.php?action=edit&id={$row['id']}"
     );
 
     $result .= Display::url(
-        Display::return_icon('delete.png', get_lang('Delete')),
+        Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
         "projects.php?action=delete&id={$row['id']}"
     );
 
@@ -171,14 +172,14 @@ $items = [
 ];
 
 $actions = Display::url(
-    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Tickets')),
     api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
 );
 $sections = TicketManager::getSettingsMenuItems('project');
 array_unshift($sections, $items);
 foreach ($sections as $item) {
     $actions .= Display::url(
-        Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon($item['icon'], 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $item['content']),
         $item['url']
     );
 }

public/main/ticket/settings.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -18,13 +20,13 @@ $action = isset($_GET['action']) ? $_GET['action'] : 'projects';
 Display::display_header(get_lang('Settings'));
 
 $actions = Display::url(
-    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Tickets')),
     api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
 );
 $sections = TicketManager::getSettingsMenuItems();
 foreach ($sections as $item) {
     $actions .= Display::url(
-        Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon($item['icon'], 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $item['content']),
         $item['url']
     );
 }

public/main/ticket/status.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 /**
  * This script is the Tickets plugin main entry point.
@@ -132,13 +133,13 @@ function modify_filter($id, $params, $row)
     $code = $row['code'];
 
     $result = Display::url(
-        Display::return_icon('edit.png', get_lang('Edit')),
+        Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')),
         api_get_self()."?action=edit&id={$id}"
     );
 
     if (!in_array($code, TicketManager::getDefaultStatusList())) {
         $result .= Display::url(
-            Display::return_icon('delete.png', get_lang('Delete')),
+            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
             api_get_self()."?action=delete&id={$id}"
         );
     }
@@ -161,14 +162,14 @@ $items = [
 ];
 
 $actions = Display::url(
-    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Tickets')),
     api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
 );
 $sections = TicketManager::getSettingsMenuItems('status');
 array_unshift($sections, $items);
 foreach ($sections as $item) {
     $actions .= Display::url(
-        Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon($item['icon'], 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $item['content']),
         $item['url']
     );
 }

public/main/ticket/ticket_details.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -331,7 +333,7 @@ if ($allowEdition
 
 Display::display_header();
 $actions = Display::url(
-    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Tickets')),
     api_get_path(WEB_CODE_PATH).'ticket/tickets.php?project_id='.$projectId
 );
 echo Display::toolbarAction('ticket', [$actions]);

public/main/ticket/tickets.php

@@ -3,6 +3,9 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 /**
  * This script is the Tickets plugin main entry point.
@@ -232,12 +235,7 @@ if (!empty($projectId)) {
     // Add link
     if ('true' === api_get_setting('ticket_allow_student_add') || api_is_platform_admin()) {
         $actionRight = Display::url(
-            Display::return_icon(
-                'add.png',
-                get_lang('Add'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add')),
             api_get_path(WEB_CODE_PATH).'ticket/new_ticket.php?project_id='.$projectId.'&'.api_get_cidReq(),
             ['title' => get_lang('Add')]
         );
@@ -245,23 +243,13 @@ if (!empty($projectId)) {
 
     if (api_is_platform_admin()) {
         $actionRight .= Display::url(
-            Display::return_icon(
-                'export_excel.png',
-                get_lang('Export'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Export')),
             api_get_self().'?action=export'.$get_parameter.$get_parameter2.'&project_id='.$projectId,
             ['title' => get_lang('Export')]
         );
 
         $actionRight .= Display::url(
-            Display::return_icon(
-                'settings.png',
-                get_lang('Settings'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ToolIcon::SETTINGS, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Settings')),
             api_get_path(WEB_CODE_PATH).'ticket/settings.php',
             ['title' => get_lang('Settings')]
         );
@@ -285,24 +273,20 @@ if (!empty($projectId)) {
     }
 
     $options = '';
-    $iconProject = Display::return_icon(
-        'project.png',
-        get_lang('Projects'),
-        null,
-        ICON_SIZE_MEDIUM
-        );
+    $iconProject = Display::getMdiIcon(ObjectIcon::PROJECT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Projects'));
     if ($isAdmin) {
         $options .= Display::url(
             $iconProject,
             api_get_path(WEB_CODE_PATH).'ticket/projects.php'
         );
     }
-    $iconTicket = Display::return_icon(
-        'tickets.png',
-        $ticketLabel,
+    $iconTicket = Display::getMdiIcon(
+        ObjectIcon::TICKET,
+        'ch-tool-icon',
         null,
-        ICON_SIZE_MEDIUM
-        );
+        ICON_SIZE_MEDIUM,
+        $ticketLabel
+    );
     $options .= Display::url(
         $iconTicket,
         $url
@@ -355,7 +339,7 @@ if (!empty($projectId)) {
     if ('true' === api_get_setting('ticket_allow_student_add')) {
         echo '<div class="actions">';
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'ticket/new_ticket.php?project_id='.$projectId.'">'.
-                Display::return_icon('add.png', get_lang('Add'), '', '32').
+                Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add')).
              '</a>';
         echo '</div>';
     }

public/main/ticket/tutor_report.lib.php

@@ -6,6 +6,9 @@
  * Helper library for weekly reports.
  */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
+
 /**
  * @param $course_code
  *
@@ -143,14 +146,14 @@ function showResults($courseInfo, $weeksCount, $page)
     if (14 == $weeksCount) {
         $html .= '<span style="float:right;"><a href="tutor.php?page='.(1 == $page ? 2 : 1).'">'.(1 == $page ? 'Siguiente' : 'Anterior').'</a></span>';
     }
-    //$html .= '<span style="float:right;"><a href="'.api_get_self().'?action=export'.$get_parameter.$get_parameter2.'">'.Display::return_icon('export_excel.png', get_lang('Export'), '', '32').'</a></span>';
+    //$html .= '<span style="float:right;"><a href="'.api_get_self().'?action=export'.$get_parameter.$get_parameter2.'">'.Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Export')).'</a></span>';
 
     $html .= '</form>';
     $html .= '<table class="reports">';
     $html .= '<tr>
             <th ></th>';
     for ($i = 7 * $page - 6; $i <= $page * 7; $i++) {
-        $html .= '<th colspan="2">Week '.$i.'<a href="assign_tickets.php?id='.$ids[$i].'" class="ajax">'.Display::return_icon('edit.png', get_lang('Edit'), ['width' => '16', 'height' => '16'], 22).'</a></th>';
+        $html .= '<th colspan="2">Week '.$i.'<a href="assign_tickets.php?id='.$ids[$i].'" class="ajax">'.Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a></th>';
     }
     $html .= '</tr>';
     $html .= $line;
@@ -202,8 +205,8 @@ function showStudentResult($datos, $pagina)
 
     $fila .= '<td><a href="'.api_get_path(WEB_CODE_PATH).'user/userInfo.php?'.api_get_cidreq().'&uInfo='.$datos[$inicio]['user_id'].'">'.$datos[$inicio]['username'].'</a></td>';
     foreach ($datos as $dato) {
-        $fila .= '<td align="center">'.(1 == $dato['work_ok'] ? Display::return_icon('check.png') : Display::return_icon('aspa.png')).'</td>';
-        $fila .= '<td align="center">'.(1 == $dato['thread_ok'] ? Display::return_icon('check.png') : Display::return_icon('aspa.png')).'</td>';
+        $fila .= '<td align="center">'.(1 == $dato['work_ok'] ? Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL) : Display::getMdiIcon(StateIcon::INCOMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL)).'</td>';
+        $fila .= '<td align="center">'.(1 == $dato['thread_ok'] ? Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL) : Display::getMdiIcon(StateIcon::INCOMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL)).'</td>';
     }
     $fila .= '</tr>';
 

public/main/tracking/total_time.php

@@ -235,9 +235,9 @@ if (api_is_platform_admin(true) ||
 
     if (!empty($sessionList)) {
         $html .= Display::page_subheader2(get_lang('Session list'));
-        $icon = Display::return_icon(
-            'session.png',
-            null,
+        $icon = Display::getMdiIcon(
+            ObjectIcon::SESSION,
+            'ch-tool-icon',
             null,
             ICON_SIZE_TINY
         );

public/main/upload/index.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 /**
  * Main script for the documents tool.
@@ -119,7 +120,7 @@ $content_origins = [
 
 echo Display::toolbarAction('lp', [
     '<a href="'.api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'">'.
-    Display::return_icon('back.png', get_lang('Back to learning paths'), '', ICON_SIZE_MEDIUM).'</a>',
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to learning paths')).'</a>',
 ]);
 
 $form = new FormValidator(

public/main/upload/upload_ppt.php

@@ -81,7 +81,7 @@ $div_upload_limit = get_lang('Upload max size').' : '.ini_get('post_max_size');
 $form = new FormValidator('upload_ppt', 'POST', '?'.api_get_cidreq(), '');
 $form->addElement('header', get_lang("A PowerPoint to SCORM Courses converter"));
 $form->addElement('html', Display::return_message($message, 'info', false));
-$form->addElement('file', 'user_file', [Display::return_icon('powerpoint_big.gif'), $div_upload_limit]);
+$form->addElement('file', 'user_file', [Display::getMdiIcon('file-presentation-box', 'ch-tool-icon', null, ICON_SIZE_SMALL), $div_upload_limit]);
 $form->addElement('checkbox', 'take_slide_name', '', get_lang('Use the slides names as course learning object names'));
 $options = ChamiloApi::getDocumentConversionSizes();
 $form->addSelect('slide_size', get_lang('Size of the slides'), $options);

public/main/upload/upload_word.php

@@ -8,6 +8,9 @@
  *
  * @author Yannick Warnier <ywarnier@beeznest.org>
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../inc/global.inc.php';
 
 api_protect_course_script(true);
@@ -152,7 +155,7 @@ $user_file_template =
 EOT;
 $renderer->setCustomElementTemplate($user_file_template);
 
-$form->addElement('file', 'user_file', Display::return_icon('word_big.gif'));
+$form->addElement('file', 'user_file', Display::getMdiIcon(ActionIcon::EXPORT_DOC, 'ch-tool-icon', null, ICON_SIZE_SMALL));
 if ('true' === api_get_setting('search_enabled')) {
     $form->addElement('checkbox', 'index_document', '', get_lang('Index document text?ument'));
     $form->addElement('html', '<br />');

public/main/user/subscribe_user.php

@@ -5,6 +5,7 @@
 use Chamilo\CoreBundle\Entity\ExtraField;
 use ExtraField as ExtraFieldModel;
 use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 /**
  * This script allows teachers to subscribe existing users
@@ -768,22 +769,24 @@ function active_filter($active, $url_params, $row)
     $_user = api_get_user_info();
     if ('1' == $active) {
         $action = 'Accountactive';
-        $image = 'accept';
+        $image = StateIcon::COMPLETE;
     }
 
     if ('0' == $active) {
         $action = 'AccountInactive';
-        $image = 'error';
+        $image = StateIcon::INCOMPLETE;
     }
     $result = '';
     if ($row['0'] != $_user['user_id']) {
         // you cannot lock yourself out otherwise you could disable all the accounts
         // including your own => everybody is locked out and nobody can change it anymore.
-        $result = Display::return_icon(
-            $image.'.png',
-            get_lang(ucfirst($action)),
-            [],
-            ICON_SIZE_TINY
+        $result = Display::getMdiIcon(
+            $image,
+            'ch-tool-icon',
+            null,
+            ICON_SIZE_TINY,
+            get_lang(ucfirst($action))
+
         );
     }
 

public/main/work/edit.php

@@ -4,6 +4,7 @@
 
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CStudentPublication;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
@@ -147,7 +148,7 @@ if ($is_allowed_to_edit) {
         $form->addLabel(
             get_lang('Download'),
             '<a href="'.api_get_path(WEB_CODE_PATH).'work/download.php?id='.$item_id.'&'.api_get_cidreq().'">'.
-                Display::return_icon('save.png', get_lang('Save'), [], ICON_SIZE_MEDIUM).'
+                Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Save')).'
             </a>'
         );
     }

public/main/work/student_work.php

@@ -4,6 +4,8 @@
 
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CStudentPublication;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
@@ -91,24 +93,24 @@ $interbreadcrumb[] = [
 Display::display_header(null);
 
 $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
-        Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).
+        Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to Assignments list')).
     '</a>';
 
 if (api_is_allowed_to_edit()) {
     $actions .= '<a
         href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=export_to_pdf&studentId='.$studentId.'&'.api_get_cidreq().'">'.
-        Display::return_icon('pdf.png', get_lang('Export to PDF'), '', ICON_SIZE_MEDIUM).
+        Display::getMdiIcon(ActionIcon::EXPORT_PDF, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Export to PDF')).
         '</a>';
 
     $actions .= '<a
         href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=download&studentId='.$studentId.'&'.api_get_cidreq().'">'.
-        Display::return_icon('save.png', get_lang('Download'), '', ICON_SIZE_MEDIUM).
+        Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Download')).
         '</a>';
 
     $actions .= '<a
             onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete').'\')) return false;"
             href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=delete_all&studentId='.$studentId.'&'.api_get_cidreq().'">'.
-        Display::return_icon('delete.png', get_lang('Delete all papers'), '', ICON_SIZE_MEDIUM).
+        Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Delete all papers')).
         '</a>';
 }
 echo Display::toolbarAction('toolbar', [$actions]);
@@ -162,17 +164,17 @@ foreach ($works as $workData) {
         $links = null;
         // is a text
         $url = api_get_path(WEB_CODE_PATH).'work/view.php?'.api_get_cidreq().'&id='.$itemId;
-        $links .= Display::url(Display::return_icon('default.png', get_lang('View')), $url);
+        $links .= Display::url(Display::getMdiIcon(ObjectIcon::DEFAULT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('View')), $url);
         if ($userResult->getResourceNode()->hasResourceFile()) {
             $url = $repo->getResourceFileDownloadUrl($userResult).'?'.api_get_cidreq();
-            $links .= Display::url(Display::return_icon('save.png', get_lang('Download')), $url);
+            $links .= Display::url(Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Download')), $url);
         }
 
         if (api_is_allowed_to_edit()) {
             $url = api_get_path(WEB_CODE_PATH).
                 'work/edit.php?'.api_get_cidreq().'&item_id='.$itemId.'&id='.$workId.'&parent_id='.$workId;
             $links .= Display::url(
-                Display::return_icon('edit.png', get_lang('Comment')),
+                Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Comment')),
                 $url
             );
         }

public/main/work/view.php

@@ -6,6 +6,8 @@ use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CStudentPublication;
 use Chamilo\CourseBundle\Entity\CStudentPublicationCorrection;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
@@ -209,23 +211,13 @@ if (($isDrhOfCourse || $allowEdition || $isDrhOfSession || user_is_author($id))
         if ($work->getContainsFile()) {
             if ($work->getResourceNode()->hasResourceFile()) {
                 $actions = Display::url(
-                    Display::return_icon(
-                        'back.png',
-                        get_lang('Back to Assignments list'),
-                        null,
-                        ICON_SIZE_MEDIUM
-                    ),
+                    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to Assignments list')),
                     api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq()
                 );
                 $url = $repo->getResourceFileDownloadUrl($work).'?'.api_get_cidreq();
 
                 $actions .= Display::url(
-                    Display::return_icon(
-                        'save.png',
-                        get_lang('Download'),
-                        null,
-                        ICON_SIZE_MEDIUM
-                    ),
+                    Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Download')),
                     $url
                 );
             }
@@ -245,23 +237,13 @@ if (($isDrhOfCourse || $allowEdition || $isDrhOfSession || user_is_author($id))
             ).'?'.api_get_cidreq();
 
             $actions .= Display::url(
-                Display::return_icon(
-                    'check-circle.png',
-                    get_lang('Correction'),
-                    null,
-                    ICON_SIZE_MEDIUM
-                ),
+                Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Correction')),
                 $url
             );
 
             if ($allowEdition) {
                 $actions .= Display::url(
-                    Display::return_icon(
-                        'delete.png',
-                        get_lang('Delete').': '.get_lang('Correction'),
-                        null,
-                        ICON_SIZE_MEDIUM
-                    ),
+                    Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Delete').': '.get_lang('Correction')),
                     api_get_self().'?action=delete_correction&id='.$id.'&'.api_get_cidreq()
                 );
             }

public/main/work/work_list.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CourseBundle\Entity\CStudentPublication;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
@@ -64,7 +65,7 @@ $interbreadcrumb[] = [
 $documentsAddedInWork = getAllDocumentsFromWorkToString($workId, $courseInfo);
 
 $actionsLeft = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
-    Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to Assignments list')).'</a>';
 
 $actionsRight = '';
 $onlyOnePublication = ('true' === api_get_setting('work.allow_only_one_student_publication_per_user'));

public/main/work/work_list_all.php

@@ -4,6 +4,8 @@
 
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CStudentPublication;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
@@ -172,30 +174,30 @@ Display::display_header(null);
 $documentsAddedInWork = getAllDocumentsFromWorkToString($workId, $courseInfo);
 
 $actionsLeft = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
-    Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
+Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to Assignments list')).'</a>';
 
 if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfCourse) {
     $blockAddDocuments = ('true' === api_get_setting('work.block_student_publication_add_documents'));
     if (!$blockAddDocuments) {
         $actionsLeft .= '<a
             href="'.api_get_path(WEB_CODE_PATH).'work/add_document.php?'.api_get_cidreq().'&id='.$workId.'">';
-        $actionsLeft .= Display::return_icon('new_document.png', get_lang('Add document'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actionsLeft .= Display::getMdiIcon(ObjectIcon::DOCUMENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add document')).'</a>';
     }
 
     $actionsLeft .= '<a
         href="'.api_get_path(WEB_CODE_PATH).'work/add_user.php?'.api_get_cidreq().'&id='.$workId.'">';
-    $actionsLeft .= Display::return_icon('addworkuser.png', get_lang('Add a user'), '', ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= Display::getMdiIcon(ActionIcon::ADD_USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add a user')).'</a>';
 
     $actionsLeft .= '<a
         href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=export_pdf">';
-    $actionsLeft .= Display::return_icon('pdf.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= Display::getMdiIcon(ActionIcon::EXPORT_PDF, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Export')).'</a>';
 
     $displayOutput = '<a
         href="'.api_get_path(WEB_CODE_PATH).'work/work_missing.php?'.api_get_cidreq().'&id='.$workId.'&list=without">'.
-    Display::return_icon('exercice_uncheck.png', get_lang('View missing assignments'), '', ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::GRADE, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('View missing assignments')).'</a>';
 
     $editLink = '<a href="'.api_get_path(WEB_CODE_PATH).'work/edit_work.php?'.api_get_cidreq().'&id='.$workId.'">';
-    $editLink .= Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
+    $editLink .= Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Edit')).'</a>';
 
     $blockEdition = ('true' === api_get_setting('work.block_student_publication_edition'));
     if ($blockEdition && !api_is_platform_admin()) {
@@ -210,24 +212,14 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfC
         $studentPublication = $repo->find($workId);
         $downloadUrl = $repo->getResourceFileDownloadUrl($studentPublication).'?'.api_get_cidreq();
         $displayOutput .= '<a class="btn-toolbar" href="'.$downloadUrl.'?'.api_get_cidreq().'">'.
-            Display::return_icon(
-                'save_pack.png',
-                get_lang('Download assignments package'),
-                null,
-                ICON_SIZE_MEDIUM
-            ).' '.get_lang('Download assignments package').'</a>';
+            Display::getMdiIcon(ActionIcon::EXPORT_ARCHIVE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Download assignments package')).' '.get_lang('Download assignments package').'</a>';
     }
     $actionsLeft .= $displayOutput;
 
     // @todo fix upload corrections.
     /*$url = api_get_path(WEB_CODE_PATH).'work/upload_corrections.php?'.api_get_cidreq().'&id='.$workId;
     $actionsLeft .= '<a class="btn-toolbar" href="'.$url.'">'.
-        Display::return_icon(
-            'upload_package.png',
-            get_lang('Upload corrections package'),
-            '',
-            ICON_SIZE_MEDIUM
-        ).' '.get_lang('Upload corrections package').'</a>';
+        Display::getMdiIcon(ActionIcon::UPLOAD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Upload corrections package')).' '.get_lang('Upload corrections package').'</a>';
     */
     $url = api_get_path(WEB_CODE_PATH).
         'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=delete_correction';

public/main/work/work_list_others.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../inc/global.inc.php';
 
 $current_course_tool = TOOL_STUDENTPUBLICATION;
@@ -74,7 +76,7 @@ $interbreadcrumb[] = [
 
 Display::display_header(null);
 $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'>'.
-    Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to Assignments list')).'</a>';
 echo Display::toolbarAction('toolbar', [$actions]);
 if (!empty($my_folder_data['description'])) {
     echo '<p><div><strong>'.get_lang('Description').':</strong><p>'.

public/main/work/work_missing.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
 
@@ -98,19 +100,19 @@ if (isset($_GET['list']) && 'with' === $_GET['list']) {
 Display::display_header(null);
 
 $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?id='.$workId.'&'.api_get_cidreq().'">'.
-    Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to Assignments list')).'</a>';
 if (!empty($workId)) {
     if (empty($_GET['list']) or 'with' == Security::remove_XSS($_GET['list'])) {
         $actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without">'.
-            Display::return_icon('exercice_uncheck.png', get_lang('ViewLearners who didn\'t send their work'), '', ICON_SIZE_MEDIUM).
+            Display::getMdiIcon(ActionIcon::GRADE, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('ViewLearners who didn\'t send their work')).
             '</a>';
     } else {
         if (!isset($_GET['action']) || (isset($_GET['action']) && 'send_mail' != $_GET['action'])) {
             $actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without&action=send_mail&sec_token='.$token.'">'.
-                Display::return_icon('mail_send.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM).
+                Display::getMdiIcon(ActionIcon::SEND_MESSAGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Send a reminder')).
                 '</a>';
         } else {
-            $actions .= Display::return_icon('mail_send_na.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM);
+            $actions .= Display::getMdiIcon(ActionIcon::SEND_MESSAGE, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Send a reminder'));
         }
     }
 }

public/plugin/bbb/ajax.php

@@ -2,6 +2,9 @@
 /**
  * This script initiates a video conference session, calling the BigBlueButton API.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $course_plugin = 'bbb'; //needed in order to load the plugin lang variables
 $cidReset = true;
 
@@ -33,7 +36,7 @@ switch ($action) {
 
             $url = $meetingInfo['video_url'].'/capture.m4v';
             $link = Display::url(
-                Display::return_icon('save.png', get_lang('Download file')),
+                Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Download file')),
                 $meetingInfo['video_url'].'/capture.m4v',
                 ['target' => '_blank']
             );

public/plugin/bbb/lib/bbb.lib.php

@@ -2,6 +2,10 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
+
 /**
  * Class bbb
  * This script initiates a video conference session, calling the BigBlueButton
@@ -1282,11 +1286,11 @@ class bbb
         $isVisible = $meetingInfo['visibility'] != 0;
         $linkVisibility = $isVisible
             ? Display::url(
-                Display::return_icon('visible.png', get_lang('MakeInvisible')),
+                Display::getMdiIcon(StateIcon::ACTIVE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('MakeInvisible')),
                 $this->unPublishUrl($meetingInfo)
             )
             : Display::url(
-                Display::return_icon('invisible.png', get_lang('MakeVisible')),
+                Display::getMdiIcon(StateIcon::INACTIVE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('MakeVisible')),
                 $this->publishUrl($meetingInfo)
             );
 
@@ -1294,12 +1298,12 @@ class bbb
         if ($this->plugin->get('allow_regenerate_recording') === 'true' && $meetingInfo['record'] == 1) {
             if (!empty($recordInfo)) {
                 $links[] = Display::url(
-                    Display::return_icon('reload.png', get_lang('RegenerateRecord')),
+                    Display::getMdiIcon(ActionIcon::REFRESH, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('RegenerateRecord')),
                     $this->regenerateRecordUrl($meetingInfo, $recordInfo)
                 );
             } else {
                 $links[] = Display::url(
-                    Display::return_icon('reload.png', get_lang('RegenerateRecord')),
+                    Display::getMdiIcon(ActionIcon::REFRESH, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('RegenerateRecord')),
                     $this->regenerateRecordUrlFromMeeting($meetingInfo)
                 );
             }
@@ -1309,7 +1313,7 @@ class bbb
             if (!$isAdminReport) {
                 if ($meetingInfo['status'] == 0) {
                     $links[] = Display::url(
-                        Display::return_icon('delete.png', get_lang('Delete')),
+                        Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
                         $this->deleteRecordUrl($meetingInfo)
                     );
                     $links[] = $linkVisibility;
@@ -1318,7 +1322,7 @@ class bbb
                 return $links;
             } else {
                 $links[] = Display::url(
-                    Display::return_icon('course_home.png', get_lang('GoToCourse')),
+                    Display::getMdiIcon(ObjectIcon::HOME, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('GoToCourse')),
                     $this->getListingUrl($meetingInfo['c_id'], $meetingInfo['session_id'], $meetingInfo['group_id'])
                 );
 
@@ -1328,11 +1332,11 @@ class bbb
 
         if (!$isGlobal) {
             $links[] = Display::url(
-                Display::return_icon('link.gif', get_lang('UrlMeetingToShare')),
+                Display::getMdiIcon(ObjectIcon::LINK, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('UrlMeetingToShare')),
                 $this->copyToRecordToLinkTool($meetingInfo)
             );
             $links[] = Display::url(
-                Display::return_icon('agenda.png', get_lang('AddToCalendar')),
+                Display::getMdiIcon(ObjectIcon::AGENDA, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('AddToCalendar')),
                 $this->addToCalendarUrl($meetingInfo, $recordInfo)
             );
         }
@@ -1342,13 +1346,13 @@ class bbb
         if ($hide == false) {
             if ($meetingInfo['has_video_m4v']) {
                 $links[] = Display::url(
-                    Display::return_icon('save.png', get_lang('DownloadFile')),
+                    Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('DownloadFile')),
                     $recordInfo['playbackFormatUrl'].'/capture.m4v',
                     ['target' => '_blank']
                 );
             } else {
                 $links[] = Display::url(
-                    Display::return_icon('save.png', get_lang('DownloadFile')),
+                    Display::getMdiIcon(ActionIcon::SAVE_FORM, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('DownloadFile')),
                     '#',
                     [
                         'id' => "btn-check-meeting-video-{$meetingInfo['id']}",
@@ -1362,13 +1366,13 @@ class bbb
 
         if (!$isAdminReport) {
             $links[] = Display::url(
-                Display::return_icon('delete.png', get_lang('Delete')),
+                Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
                 $this->deleteRecordUrl($meetingInfo)
             );
             $links[] = $linkVisibility;
         } else {
             $links[] = Display::url(
-                Display::return_icon('course_home.png', get_lang('GoToCourse')),
+                Display::getMdiIcon(ObjectIcon::HOME, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('GoToCourse')),
                 $this->getListingUrl($meetingInfo['c_id'], $meetingInfo['session_id'], $meetingInfo['group_id'])
             );
         }

public/plugin/buycourses/src/export_report.php

@@ -1,5 +1,8 @@
 <?php
 /* For license terms, see /license.txt */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 //Initialization
 $cidReset = true;
 
@@ -48,7 +51,7 @@ $interbreadcrumb[] = [
 
 $templateName = $plugin->get_lang('ExportReport');
 $toolbar = Display::url(
-    Display::return_icon('back.png', get_lang('GoBack'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('GoBack')),
     api_get_path(WEB_PLUGIN_PATH).'buycourses/src/sales_report.php'
 );
 $template = new Template($templateName);

public/plugin/courselegal/start.php

@@ -2,6 +2,8 @@
 
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 require_once __DIR__.'/config.php';
 
 // Course legal
@@ -58,7 +60,7 @@ if ($form->validate()) {
 }
 Display::display_header($legal->get_lang('CourseLegal'));
 $url = api_get_path(WEB_PLUGIN_PATH).'courselegal/user_list.php?'.api_get_cidreq();
-$link = Display::url(Display::return_icon('user.png', get_lang('User list')), $url);
+$link = Display::url(Display::getMdiIcon(ActionIcon::USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('User list')), $url);
 echo '<div class="actions">'.$link.'</div>';
 $form->display();
 

public/plugin/courselegal/user_list.php

@@ -2,6 +2,9 @@
 
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+
 require_once __DIR__.'/config.php';
 
 // Course legal
@@ -58,12 +61,12 @@ if (!empty($userList)) {
         $mailDate = !empty($user['mail_agreement_date']) ? api_get_local_time($user['mail_agreement_date']) : '-';
         $url = $pluginPath.'user_list.php?action=resend&user_id='.$user['user_id'].'&'.api_get_cidreq();
         $link = Display::url(
-            Display::return_icon('inbox.png', $legal->get_lang('ReSendMailAgreementLink')),
+            Display::getMdiIcon(ToolIcon::MESSAGE, 'ch-tool-icon', null, ICON_SIZE_SMALL, $legal->get_lang('ReSendMailAgreementLink')),
             $url
         );
 
         $deleteLink = Display::url(
-            Display::return_icon('delete.png', $legal->get_lang('Delete')),
+            Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, $legal->get_lang('Delete')),
             $pluginPath.'user_list.php?action=delete&user_id='.$user['user_id'].'&'.api_get_cidreq()
         );
 

public/plugin/customcertificate/src/index.php

@@ -1,6 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $useDefault = false;
 $isDefault = isset($_GET['default']) ? (int) $_GET['default'] : null;
 
@@ -231,12 +234,12 @@ if (empty($infoCertificate)) {
 // Display the header
 Display::display_header($nameTools);
 $actionsLeft = Display::url(
-    Display::return_icon('certificate.png', get_lang('Certificate'), '', ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ObjectIcon::CERTIFICATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Certificate')),
     'print_certificate.php'.$urlParams
 );
 if (!empty($courseId) && !$useDefault) {
     $actionsLeft .= Display::url(
-        Display::return_icon('delete.png', $plugin->get_lang('DeleteCertificate'), '', ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $plugin->get_lang('DeleteCertificate')),
         'delete_certificate.php'.$urlParams,
         ['id' => 'delete_certificate']
     );

public/plugin/dashboard/block_daily/block_daily.class.php

@@ -11,6 +11,8 @@
  * required files for getting data.
  */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 /**
  * This class is used like controller for this course block plugin,
  * the class name must be registered inside path.info file
@@ -175,7 +177,7 @@ class BlockDaily extends Block
                 $attendance['course_code'] = $course_info['code'];
 
                 if ('0' != $attendance['done']) {
-                    $attendances[] = '<a href="'.api_get_path(WEB_PATH).'main/attendance/index.php?cidReq='.$attendance['course_code'].'&action=attendance_sheet_print&attendance_id='.$attendance['id'].'">'.Display::return_icon('printmgr.gif', get_lang('Print')).'</a>';
+                    $attendances[] = '<a href="'.api_get_path(WEB_PATH).'main/attendance/index.php?cidReq='.$attendance['course_code'].'&action=attendance_sheet_print&attendance_id='.$attendance['id'].'">'.Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Print')).'</a>';
                 } else {
                     $attendances[] = get_lang('Not available');
                 }

public/plugin/learning_calendar/LearningCalendarPlugin.php

@@ -2,6 +2,8 @@
 
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 /**
  * Class LearningCalendarPlugin.
  */
@@ -222,17 +224,17 @@ class LearningCalendarPlugin extends Plugin
                 api_get_path(WEB_PLUGIN_PATH).'learning_calendar/calendar.php?id='.$id
             );
             $actions = Display::url(
-                Display::return_icon('edit.png', get_lang('Edit')),
+                Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')),
                 $link.'?action=edit&id='.$id
             );
 
             $actions .= Display::url(
-                Display::return_icon('copy.png', get_lang('Copy')),
+                Display::getMdiIcon(ActionIcon::COPY_CONTENT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Copy')),
                 $link.'?action=copy&id='.$id
             );
 
             $actions .= Display::url(
-                Display::return_icon('delete.png', get_lang('Delete')),
+                Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')),
                 $link.'?action=delete&id='.$id
             );
             $row['actions'] = $actions;

public/plugin/learning_calendar/calendar.php

@@ -2,6 +2,8 @@
 
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
 $calendarId = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
@@ -28,12 +30,7 @@ $formToString = '';
 
 $template = new Template();
 $actionLeft = Display::url(
-    Display::return_icon(
-        'back.png',
-        get_lang('Add'),
-        null,
-        ICON_SIZE_MEDIUM
-    ),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add')),
     api_get_path(WEB_PLUGIN_PATH).'learning_calendar/start.php'
 );
 

public/plugin/learning_calendar/calendar_users.php

@@ -1,6 +1,8 @@
 <?php
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
 $calendarId = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
@@ -16,12 +18,7 @@ $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 $formToString = '';
 $template = new Template();
 $actionLeft = Display::url(
-    Display::return_icon(
-        'back.png',
-        get_lang('Add'),
-        null,
-        ICON_SIZE_MEDIUM
-    ),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')),
     api_get_path(WEB_PLUGIN_PATH).'learning_calendar/start.php'
 );
 
@@ -58,7 +55,7 @@ $extraParams['sortname'] = 'name';
 $extraParams['sortorder'] = 'desc';
 $extraParams['multiselect'] = true;
 
-$deleteIcon = Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_SMALL);
+$deleteIcon = Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete'));
 $urlStats = api_get_path(WEB_CODE_PATH);
 $action_links = '';
 $deleteUrl = '';
@@ -100,7 +97,7 @@ Display::display_header();
 // action links
 echo '<div class="actions">';
 echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/usergroup_users.php?id='.$calendarId.'">'.
-    Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Administration'), '', '32').
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to').' '.get_lang('Administration')).
     '</a>';
 echo '</div>';
 echo Display::grid_html('usergroups');

public/plugin/learning_calendar/start.php

@@ -2,6 +2,8 @@
 
 /* For license terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
 $allow = api_is_platform_admin() || api_is_teacher();
@@ -149,22 +151,12 @@ $template = new Template();
 
 if (in_array($action, ['add', 'edit'])) {
     $actionLeft = Display::url(
-        Display::return_icon(
-            'back.png',
-            get_lang('Back'),
-            null,
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')),
         api_get_self().'?'.api_get_cidreq()
     );
 } else {
     $actionLeft = Display::url(
-        Display::return_icon(
-            'add.png',
-            get_lang('Add'),
-            null,
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add')),
         api_get_self().'?'.api_get_cidreq().'&action=add'
     );
 

public/plugin/notebookteacher/src/NotebookTeacher.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 /**
  * This class provides methods for the notebook management.
@@ -262,31 +263,26 @@ class NotebookTeacher
             if (!api_is_anonymous()) {
                 if (empty($sessionId)) {
                     echo '<a href="'.$currentUrl.'&action=addnote">'.
-                        Display::return_icon(
-                            'new_note.png',
-                            get_lang('Add new note in my personal notebook'),
-                            '',
-                            '32'
-                        ).'</a>';
+                        Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add new note in my personal notebook')).'</a>';
                 } elseif (api_is_allowed_to_session_edit(false, true)) {
                     echo '<a href="'.$currentUrl.'&action=addnote">'.
-                        Display::return_icon('new_note.png', get_lang('Add new note in my personal notebook'), '', '32').'</a>';
+                        Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add new note in my personal notebook')).'</a>';
                 }
             } else {
                 echo '<a href="javascript:void(0)">'.
-                    Display::return_icon('new_note.png', get_lang('Add new note in my personal notebook'), '', '32').'</a>';
+                    Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add new note in my personal notebook')).'</a>';
             }
         }
 
         echo '<a href="'.$currentUrl.
                 '&action=changeview&view=creation_date&direction='.$linkSortDirection.'">'.
-            Display::return_icon('notes_order_by_date_new.png', get_lang('Sort by date created'), '', '32').'</a>';
+            Display::getMdiIcon(ActionIcon::SORT_DATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Sort by date created')).'</a>';
         echo '<a href="'.$currentUrl.
                 '&action=changeview&view=update_date&direction='.$linkSortDirection.'">'.
-            Display::return_icon('notes_order_by_date_mod.png', get_lang('Sort by date last modified'), '', '32').'</a>';
+            Display::getMdiIcon(ActionIcon::SORT_DATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Sort by date last modified')).'</a>';
         echo '<a href="'.$currentUrl.
                 '&action=changeview&view=title&direction='.$linkSortDirection.'">'.
-            Display::return_icon('notes_order_by_title.png', get_lang('Sort by title'), '', '32').'</a>';
+            Display::getMdiIcon(ActionIcon::SORT_ALPHA, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Sort by title')).'</a>';
 
         echo '</div>';
         echo '<div class="row">'.$selectStudent.'</div>';
@@ -349,12 +345,12 @@ class NotebookTeacher
                         $actions = '<a href="'.
                                 api_get_self().'?'.
                                 api_get_cidreq().'&student_id='.$studentId.'&action=editnote&notebook_id='.$row['id'].'">'.
-                                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+                                Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a>';
                         $actions .= '<a href="'.
                                 api_get_self().
                                 '?action=deletenote&student_id='.$studentId.'&notebook_id='.$row['id'].
                                 '" onclick="return confirmation(\''.$row['title'].'\');">'.
-                                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
+                                Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'</a>';
                     }
                     echo Display::panel(
                         $row['description'],
@@ -401,16 +397,11 @@ class NotebookTeacher
                         if ((int) ($row['user_id']) == api_get_user_id()) {
                             $actions = '<a href="'.api_get_self().
                                 '?action=editnote&notebook_id='.$row['id'].'&'.api_get_cidreq().'">'.
-                                    Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+                                    Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a>';
                             $actions .= '<a href="'.api_get_self().
                                     '?action=deletenote&notebook_id='.$row['id'].
                                     '" onclick="return confirmation(\''.$row['title'].'\');">'.
-                                    Display::return_icon(
-                                        'delete.png',
-                                        get_lang('Delete'),
-                                        '',
-                                        ICON_SIZE_SMALL
-                                    ).'</a>';
+                                    Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'</a>';
                         }
 
                         echo Display::panel(
@@ -452,11 +443,11 @@ class NotebookTeacher
                     if ((int) ($row['user_id']) == api_get_user_id()) {
                         $actions = '<a href="'.api_get_self().
                                 '?action=editnote&notebook_id='.$row['id'].'&'.api_get_cidreq().'">'.
-                                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+                                Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).'</a>';
                         $actions .= '<a href="'.api_get_self().
                                 '?action=deletenote&notebook_id='.$row['id'].
                                 '" onclick="return confirmation(\''.$row['title'].'\');">'.
-                                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
+                                Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'</a>';
                     }
 
                     echo Display::panel(

public/plugin/notebookteacher/src/index.php

@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 $course_plugin = 'notebookteacher';
 require_once __DIR__.'/../config.php';
@@ -100,7 +101,7 @@ switch ($action) {
 
             echo '<div class="actions">';
             echo '<a href="index.php">'.
-                Display::return_icon('back.png', get_lang('Back to the notes list'), '', ICON_SIZE_MEDIUM).
+                Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to the notes list')).
                 '</a>';
             echo '</div>';
             $token = Security::get_token();
@@ -160,7 +161,7 @@ switch ($action) {
             Display::display_introduction_section($noteBookTeacher);
             echo '<div class="actions">';
             echo '<a href="index.php">'.
-                Display::return_icon('back.png', get_lang('Back to the notes list'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back to the notes list')).'</a>';
             echo '</div>';
             $token = Security::get_token();
             $form->addElement('hidden', 'sec_token');

public/plugin/resubscription/src/HookResubscription.php

@@ -5,6 +5,7 @@
 use Chamilo\CoreBundle\Hook\HookObserver;
 use Chamilo\CoreBundle\Hook\Interfaces\HookResubscribeEventInterface;
 use Chamilo\CoreBundle\Hook\Interfaces\HookResubscribeObserverInterface;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 /**
  * Hook to limit session resubscriptions.
@@ -104,7 +105,7 @@ class HookResubscription extends HookObserver implements HookResubscribeObserver
                 if (isset($userSessionCourses[$currentSessionCourse['c_id']])) {
                     $endDate = $userSessionCourses[$currentSessionCourse['c_id']];
                     $resubscriptionDate = gmdate($limitDateFormat, strtotime($endDate." +$resubscriptionOffset"));
-                    $icon = Display::return_icon('students.gif', get_lang('Learner'));
+                    $icon = Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Learner'));
                     $canResubscribeFrom = sprintf(
                         get_plugin_lang('CanResubscribeFromX', 'resubscription'),
                         $resubscriptionDate

public/plugin/studentfollowup/post.php

@@ -6,6 +6,7 @@ use Chamilo\PluginBundle\Entity\StudentFollowUp\CarePost;
 use Doctrine\Common\Collections\Criteria;
 use Gaufrette\Adapter\Ftp as FtpAdapter;
 use Gaufrette\Filesystem;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
@@ -125,11 +126,11 @@ $tpl->assign('post_url', $url);
 $tpl->assign(
     'back_link',
     Display::url(
-        Display::return_icon('back.png'),
+        Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_SMALL),
         api_get_path(WEB_PLUGIN_PATH).'studentfollowup/posts.php?student_id='.$studentId
     )
 );
-$tpl->assign('information_icon', Display::return_icon('info.png'));
+$tpl->assign('information_icon', Display::getMdiIcon(ActionIcon::INFORMATION, 'ch-tool-icon', null, ICON_SIZE_SMALL));
 $tpl->assign('student_info', api_get_user_info($studentId));
 $tpl->assign('care_title', $plugin->get_lang('Student care detail view'));
 

public/plugin/studentfollowup/posts.php

@@ -4,6 +4,7 @@
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Tools\Pagination\Paginator;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 require_once __DIR__.'/../../main/inc/global.inc.php';
 
@@ -72,7 +73,7 @@ $tpl->assign('current_url', $url);
 
 $url = api_get_path(WEB_PLUGIN_PATH).'studentfollowup/post.php?student_id='.$studentId;
 $tpl->assign('post_url', $url);
-$tpl->assign('information_icon', Display::return_icon('info.png'));
+$tpl->assign('information_icon', Display::getMdiIcon(ActionIcon::INFORMATION, 'ch-tool-icon', null, ICON_SIZE_SMALL));
 $tpl->assign('student_info', api_get_user_info($studentId));
 $tpl->assign('pagination', $pagination);
 $tpl->assign('care_title', $plugin->get_lang('Student care detail view'));

public/plugin/surveyexportcsv/SurveyExportCsvPlugin.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 /**
  * Class SurveyExportCsvPlugin.
  */
@@ -65,7 +67,7 @@ class SurveyExportCsvPlugin extends Plugin
         }
 
         return Display::url(
-            Display::return_icon('export_csv.png', get_lang('CSV export'), [], $iconSize),
+            Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, $iconSize, get_lang('CSV export')),
             api_get_path(WEB_PLUGIN_PATH).'surveyexportcsv/export.php?survey='.$surveyId.'&'.api_get_cidreq()
         );
     }

public/plugin/surveyexporttxt/SurveyExportTxtPlugin.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 /**
  * Class SurveyExportTxtPlugin.
  */
@@ -65,7 +67,7 @@ class SurveyExportTxtPlugin extends Plugin
         }
 
         return Display::url(
-            Display::return_icon('export_evaluation.png', get_lang('Export'), [], $iconSize),
+            Display::getMdiIcon(ActionIcon::EXPORT_ARCHIVE, 'ch-tool-icon', null, $iconSize, get_lang('Export')),
             api_get_path(WEB_PLUGIN_PATH).'surveyexporttxt/export.php?survey='.$surveyId.'&'.api_get_cidreq()
         );
     }

public/plugin/zoom/lib/ZoomPlugin.php

@@ -23,6 +23,8 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\Tools\ToolsException;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
 
 /**
  * Class ZoomPlugin. Integrates Zoom meetings in courses.
@@ -134,10 +136,7 @@ class ZoomPlugin extends Plugin
         foreach ($elements as $title => $link) {
             $items[] = [
                 'class' => 'video-conference',
-                'icon' => Display::return_icon(
-                    'bbb.png',
-                    get_lang('VideoConference')
-                ),
+                'icon' => Display::getMdiIcon(ToolIcon::VIDEOCONFERENCE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('VideoConference')),
                 'link' => $link,
                 'title' => $title,
             ];
@@ -1110,20 +1109,20 @@ class ZoomPlugin extends Plugin
         if (empty($courseId)) {
             $actionsLeft .=
                 Display::url(
-                    Display::return_icon('bbb.png', $this->get_lang('Meetings'), null, ICON_SIZE_MEDIUM),
+                    Display::getMdiIcon(ToolIcon::VIDEOCONFERENCE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $this->get_lang('Meetings')),
                     api_get_path(WEB_PLUGIN_PATH).'zoom/meetings.php'
                 );
         } else {
             $actionsLeft .=
                 Display::url(
-                    Display::return_icon('bbb.png', $this->get_lang('Meetings'), null, ICON_SIZE_MEDIUM),
+                    Display::getMdiIcon(ToolIcon::VIDEOCONFERENCE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, $this->get_lang('Meetings')),
                     api_get_path(WEB_PLUGIN_PATH).'zoom/start.php?'.api_get_cidreq()
                 );
         }
 
         if (!empty($returnUrl)) {
             $back = Display::url(
-                Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM),
+                Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')),
                 $returnUrl
             );
         }
@@ -1131,7 +1130,7 @@ class ZoomPlugin extends Plugin
         if (api_is_platform_admin()) {
             $actionsLeft .=
                 Display::url(
-                    Display::return_icon('settings.png', get_lang('Settings'), null, ICON_SIZE_MEDIUM),
+                    Display::getMdiIcon(ToolIcon::SETTINGS, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Settings')),
                     api_get_path(WEB_CODE_PATH).'admin/configure_plugin.php?name=zoom'
                 ).$back;
         }

src/LtiBundle/Controller/CourseController.php

@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use UserManager;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
 
 /**
  * Class CourseController.
@@ -428,7 +429,7 @@ class CourseController extends ToolBaseController
 
             if (!empty($categories)) {
                 $actions .= Display::url(
-                    Display::return_icon('gradebook.png', get_lang('Add to gradebook'), [], ICON_SIZE_MEDIUM),
+                    Display::getMdiIcon(ToolIcon::GRADEBOOK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add to gradebook')),
                     $this->generateUrl(
                         'chamilo_lti_grade',
                         [