diff --git a/public/main/my_space/access_details_session.php b/public/main/my_space/access_details_session.php
index 09a9a5fd5c..4a8477a723 100644
--- a/public/main/my_space/access_details_session.php
+++ b/public/main/my_space/access_details_session.php
@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+
 require_once __DIR__.'/../inc/global.inc.php';
 
 api_block_anonymous_users();
@@ -267,7 +269,7 @@ function getReport($userId, $from, $to, $addTime = false)
 
     $courseSessionTable = '';
     $courseSessionTableData = [];
-    $iconCourse = Display::return_icon('course.png', null, [], ICON_SIZE_SMALL);
+    $iconCourse = Display::getMdiIcon(ToolIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL);
     foreach ($report as $sessionId => $data) {
         foreach ($data['courses'] as $courseId => $courseData) {
             if (empty($courseData)) {
@@ -545,7 +547,7 @@ if ($formByDay->validate()) {
         $courseSessionTable = $result['second'];
         $totalCourseSessionTable = $result['third'];
         $total = $result['total'];
-        $iconCalendar = Display::return_icon('calendar.png', null, [], ICON_SIZE_SMALL);
+        $iconCalendar = Display::getMdiIcon(ToolIcon::AGENDA, 'ch-tool-icon', null, ICON_SIZE_SMALL);
         $tableList .= '<div class="date-calendar">'.Display::page_subheader2(
                 $iconCalendar.get_lang('Date').': '.$dateToCheck
             ).'</div>';
diff --git a/public/main/my_space/coaches.php b/public/main/my_space/coaches.php
index 7542cf4177..a131f8e31b 100644
--- a/public/main/my_space/coaches.php
+++ b/public/main/my_space/coaches.php
@@ -3,6 +3,7 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 ob_start();
 $cidReset = true;
@@ -169,12 +170,12 @@ if (Database::num_rows($result_coachs) > 0) {
 			        <td>'.$firstname.'</td><td>'.$lastname.'</td><td>'.$s_connection_time.'</td>
 			        <td>
 			            <a href="course.php?type=coach&user_id='.$id_coach.'">
-                        '.Display::return_icon('2rightarrow.png', get_lang('Details')).'
+                        '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'
 			            </a>
                     </td>
 			        <td>
 			            <a href="student.php?type=coach&user_id='.$id_coach.'">
-			                '.Display::return_icon('2rightarrow.png', get_lang('Details')).'
+			                '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'
 			            </a>
 			            </td>
                     </tr>';
@@ -184,10 +185,10 @@ if (Database::num_rows($result_coachs) > 0) {
 			        <td>'.$s_connection_time.'</td>
 			        <td>
 			            <a href="course.php?type=coach&user_id='.$id_coach.'">
-			            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a></td>
+			            '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'</a></td>
                     <td>
                         <a href="student.php?type=coach&user_id='.$id_coach.'">
-                        '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>
+                        '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'</a>
                     </td>
                     </tr>';
         }
diff --git a/public/main/my_space/company_reports.php b/public/main/my_space/company_reports.php
index e66dd23e6f..4759f4f34c 100644
--- a/public/main/my_space/company_reports.php
+++ b/public/main/my_space/company_reports.php
@@ -5,6 +5,10 @@
 /**
  * Special report for corporate users.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -226,24 +230,19 @@ $actions = null;
 
 if (api_is_student_boss()) {
     $actions .= Display::url(
-        Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
         api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
     );
     $actions .= Display::url(
-        Display::return_icon('user.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
         api_get_path(WEB_CODE_PATH).'my_space/student.php'
     );
     $actions .= Display::url(
-        Display::return_icon('statistics.png', get_lang('Corporate report'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Corporate report')),
         "#"
     );
     $actions .= Display::url(
-        Display::return_icon(
-            'certificate_list.png',
-            get_lang('GradebookSeeListOfLearnersCertificates'),
-            [],
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ObjectIcon::CERTIFICATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('GradebookSeeListOfLearnersCertificates')),
         api_get_path(WEB_CODE_PATH).'gradebook/certificate_report.php'
     );
 }
diff --git a/public/main/my_space/company_reports_resumed.php b/public/main/my_space/company_reports_resumed.php
index 7fd2a91dc2..d8d675c4c9 100644
--- a/public/main/my_space/company_reports_resumed.php
+++ b/public/main/my_space/company_reports_resumed.php
@@ -3,6 +3,10 @@
 /**
  * Special report for corporate users.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -85,24 +89,19 @@ $actions = null;
 
 if (api_is_student_boss()) {
     $actions .= Display::url(
-        Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
         api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
     );
     $actions .= Display::url(
-        Display::return_icon('user.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
         api_get_path(WEB_CODE_PATH).'my_space/student.php'
     );
     $actions .= Display::url(
-        Display::return_icon('statistics.png', get_lang('Corporate report'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Corporate report')),
         api_get_path(WEB_CODE_PATH).'my_space/company_reports.php'
     );
     $actions .= Display::url(
-        Display::return_icon(
-            'certificate_list.png',
-            get_lang('GradebookSeeListOfLearnersCertificates'),
-            [],
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ObjectIcon::CERTIFICATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('GradebookSeeListOfLearnersCertificates')),
         api_get_path(WEB_CODE_PATH).'gradebook/certificate_report.php'
     );
 }
diff --git a/public/main/my_space/course.php b/public/main/my_space/course.php
index 4556c862c0..7f1398935f 100644
--- a/public/main/my_space/course.php
+++ b/public/main/my_space/course.php
@@ -2,6 +2,9 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Framework\Container;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 ob_start();
 $cidReset = true;
@@ -83,23 +86,23 @@ if (api_is_platform_admin(true, true)) {
 
     if (!api_is_session_admin()) {
         $menu_items[] = Display::url(
-            Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
             api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('user.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
             'index.php?view=drh_students&display=yourstudents'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('teacher.png', get_lang('Teachers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Teachers')),
             'teachers.php'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('course_na.png', get_lang('Courses'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Courses')),
             '#'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('session.png', get_lang('Sessions'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Sessions')),
             api_get_path(WEB_CODE_PATH).'my_space/session.php'
         );
         $menu_items[] = Display::url(
@@ -114,7 +117,7 @@ if (api_is_platform_admin(true, true)) {
         if (api_can_login_as($user_id)) {
             $link = '<a
                     href="'.api_get_path(WEB_CODE_PATH).'admin/user_list.php?action=login_as&user_id='.$user_id.'&sec_token='.Security::get_existing_token().'">'.
-                    Display::return_icon('login_as.png', get_lang('Login as'), null, ICON_SIZE_MEDIUM).'</a>&nbsp;&nbsp;';
+                    Display::getMdiIcon(ActionIcon::LOGIN_AS, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Login as')).'</a>&nbsp;&nbsp;';
             $menu_items[] = $link;
         }
     }
@@ -129,7 +132,7 @@ if (api_is_platform_admin(true, true)) {
 
     if (count($a_courses) > 0) {
         $actionsRight .= Display::url(
-            Display::return_icon('printer.png', get_lang('Print'), [], 32),
+            Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
             'javascript: void(0);',
             ['onclick' => 'javascript: window.print();']
         );
@@ -143,7 +146,7 @@ if (api_is_platform_admin(true, true)) {
 if ($showImportIcon) {
     echo "<div align=\"right\">";
     echo '<a href="user_import.php?id_session='.$sessionId.'&action=export&type=xml">'.
-            Display::return_icon('excel.gif', get_lang('Import users list')).'&nbsp;'.get_lang('Import users list').'</a>';
+            Display::getMdiIcon(ActionIcon::IMPORT_ARCHIVE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Import users list')).'&nbsp;'.get_lang('Import users list').'</a>';
     echo "</div><br />";
 }
 
@@ -329,7 +332,7 @@ function get_courses($from, $limit, $column, $direction)
 
             $courseIcon = '<a
                 href="'.api_get_path(WEB_CODE_PATH).'tracking/courseLog.php?cid='.$courseId.'&sid='.$sessionId.'">
-                '.Display::return_icon('2rightarrow.png', get_lang('Details')).'
+                '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'
               </a>';
             $title = Display::url(
                 $data['title'],
@@ -345,7 +348,7 @@ function get_courses($from, $limit, $column, $direction)
                 $checkExport = $attendance->getAttendanceLogin($startDate, $endDate);
                 if (false !== $checkExport) {
                     $attendanceLink = Display::url(
-                        Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM),
+                        Display::getMdiIcon(ToolIcon::ATTENDANCE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Logins')),
                         api_get_path(WEB_CODE_PATH).'attendance/index.php?cid='.$courseId.'&sid='.$sessionId.'&action=calendar_logins'
                     );
                 }
@@ -379,10 +382,10 @@ $table = new SortableTable(
 
 $table->set_header(0, get_lang('Course title'), false);
 $table->set_header(1, get_lang('NbLearners'), false);
-$table->set_header(2, get_lang('Time spent in the course').Display::return_icon('info.png', get_lang('Time in course'), ['align' => 'absmiddle', 'hspace' => '3px']), false);
+$table->set_header(2, get_lang('Time spent in the course').Display::getMdiIcon(ActionIcon::INFORMATION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Time in course')), false);
 $table->set_header(3, get_lang('Thematic advance'), false);
-$table->set_header(4, get_lang('AvgLearnersProgress').Display::return_icon('info.png', get_lang('Average of all learners in all courses'), ['align' => 'absmiddle', 'hspace' => '3px']), false);
-$table->set_header(5, get_lang('Average score in learning paths').Display::return_icon('info.png', get_lang('Average of all learners in all courses'), ['align' => 'absmiddle', 'hspace' => '3px']), false);
+$table->set_header(4, get_lang('AvgLearnersProgress').Display::getMdiIcon(ActionIcon::INFORMATION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Average of all learners in all courses')), false);
+$table->set_header(5, get_lang('Average score in learning paths').Display::getMdiIcon(ActionIcon::INFORMATION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Average of all learners in all courses')), false);
 $table->set_header(6, get_lang('Messages per learner'), false);
 $table->set_header(7, get_lang('Assignments'), false);
 $table->set_header(8, get_lang('Attendances'), false);
diff --git a/public/main/my_space/current_courses.php b/public/main/my_space/current_courses.php
index 2125314c48..ceee351aad 100644
--- a/public/main/my_space/current_courses.php
+++ b/public/main/my_space/current_courses.php
@@ -5,6 +5,9 @@
 /**
  * Report for current courses followed by the user.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_TRACKING;
@@ -242,8 +245,8 @@ foreach ($array as $row_table) {
 }
 
 echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'my_space/index.php">'.Display::return_icon('back.png', get_lang('Back'), [], 32).'</a>';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'my_space/current_courses.php?export=1">'.Display::return_icon('export_excel.png', get_lang('Current coursesReport'), [], 32).'</a> ';
+echo '<a href="'.api_get_path(WEB_CODE_PATH).'my_space/index.php">'.Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')).'</a>';
+echo '<a href="'.api_get_path(WEB_CODE_PATH).'my_space/current_courses.php?export=1">'.Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Current coursesReport')).'</a> ';
 echo '</div>';
 echo '<div style="overflow:auto;">';
 echo $table->toHtml();
diff --git a/public/main/my_space/exercise_category_report.php b/public/main/my_space/exercise_category_report.php
index 06008bf545..d9517b7495 100644
--- a/public/main/my_space/exercise_category_report.php
+++ b/public/main/my_space/exercise_category_report.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';
@@ -281,7 +283,7 @@ if ($form->validate() && !empty($courseInfo)) {
         [
             'url' => '  ',
             'url_attributes' => ['id' => 'excel_export'],
-            'content' => Display::return_icon('export_excel.png', get_lang('Excel export')),
+            'content' => Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Excel export')),
         ],
     ];
 
diff --git a/public/main/my_space/lp_tracking.php b/public/main/my_space/lp_tracking.php
index 2a8032ccca..e23dc06998 100644
--- a/public/main/my_space/lp_tracking.php
+++ b/public/main/my_space/lp_tracking.php
@@ -4,6 +4,9 @@
 
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
 use Chamilo\CourseBundle\Entity\CLpItemView;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 /**
  * Learning paths reporting.
@@ -169,9 +172,9 @@ switch ($action) {
                 }
                 $table->setCellContents($row, 0, 'Q'.$choiceCounter);
                 $table->setCellContents($row, 1, $option['student_response_formatted']);
-                $result = Display::return_icon('icon_check.png', null, [], ICON_SIZE_SMALL);
+                $result = Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL);
                 if ('wrong' === $option['result']) {
-                    $result = Display::return_icon('icon_error.png', null, [], ICON_SIZE_SMALL);
+                    $result = Display::getMdiIcon(StateIcon::INCOMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL);
                 }
 
                 $table->setCellContents($row, 2, $result);
@@ -278,29 +281,29 @@ $output = require_once api_get_path(SYS_CODE_PATH).'lp/lp_stats.php';
 
 $actions = [];
 $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')),
     'javascript:history.back();'
 );
 $actions[] = Display::url(
-    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
     'javascript:window.print();'
 );
 $actions[] = Display::url(
-    Display::return_icon('export_csv.png', get_lang('CSV export'), '', ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')),
     api_get_self().'?export=csv&'.Security::remove_XSS($_SERVER['QUERY_STRING'])
 );
 
 Display::display_header($nameTools);
 echo Display::toolbarAction('actions', [implode(PHP_EOL, $actions)]);
 $table_title = $session_id
-    ? Display::return_icon('session.png', get_lang('Session')).PHP_EOL.api_get_session_name($session_id).PHP_EOL
+    ? Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Session')).PHP_EOL.api_get_session_name($session_id).PHP_EOL
     : PHP_EOL;
-$table_title .= Display::return_icon('course.png', get_lang('Course')).PHP_EOL.$courseInfo['name'].PHP_EOL
-    .Display::return_icon('user.png', get_lang('User')).' '.$name;
+$table_title .= Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Course')).PHP_EOL.$courseInfo['name'].PHP_EOL
+    .Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('User')).' '.$name;
 
 echo Display::page_header($table_title);
 echo Display::page_subheader(
-    Display::return_icon('learnpath.png', get_lang('Learning path')).PHP_EOL.$lp_title
+    Display::getMdiIcon(ObjectIcon::LP, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Learning path')).PHP_EOL.$lp_title
 );
 echo $output;
 Display::display_footer();
diff --git a/public/main/my_space/myStudents.php b/public/main/my_space/myStudents.php
index 5e997b5609..a12b2cf78a 100644
--- a/public/main/my_space/myStudents.php
+++ b/public/main/my_space/myStudents.php
@@ -9,6 +9,10 @@ use Chamilo\CourseBundle\Entity\CLpCategory;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CStudentPublication;
 use ChamiloSession as Session;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+use Chamilo\CoreBundle\Component\Utils\StateIcon;
 
 if (!isset($_GET['course'])) {
     $cidReset = true;
@@ -719,34 +723,34 @@ $token = Security::get_token();
 
 // Actions bar
 $actions = '<a href="javascript: window.history.go(-1);">'
-    .Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
+    .Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')).'</a>';
 
 $actions .= '<a href="javascript: void(0);" onclick="javascript: window.print();">'
-    .Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
+    .Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')).'</a>';
 
 $actions .= '<a href="'.api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']).'&export=csv">'
-    .Display::return_icon('export_csv.png', get_lang('CSV export'), '', ICON_SIZE_MEDIUM).'</a> ';
+    .Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')).'</a> ';
 
 $actions .= '<a href="'.api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']).'&export=xls">'
-    .Display::return_icon('export_excel.png', get_lang('Excel export'), '', ICON_SIZE_MEDIUM).'</a> ';
+    .Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Excel export')).'</a> ';
 
 $actions .= Display::url(
-    Display::return_icon('attendance.png', get_lang('Access details'), '', ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ObjectIcon::ATTENDANCE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Access details')),
     api_get_path(WEB_CODE_PATH).'my_space/access_details_session.php?user_id='.$studentId
 );
 $email = $user->getEmail();
 if (!empty($email)) {
     $send_mail = '<a href="mailto:'.$email.'">'.
-        Display::return_icon('mail_send.png', get_lang('Send message mail'), '', ICON_SIZE_MEDIUM).'</a>';
+        Display::getMdiIcon(ActionIcon::SEND_MESSAGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Send message mail')).'</a>';
 } else {
-    $send_mail = Display::return_icon('mail_send_na.png', get_lang('Send message mail'), '', ICON_SIZE_MEDIUM);
+    $send_mail = Display::getMdiIcon(ActionIcon::SEND_MESSAGE, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Send message mail'));
 }
 $actions .= $send_mail;
 if (!empty($studentId) && !empty($courseCode)) {
     // Only show link to connection details if course and student were defined in the URL
     $actions .= '<a href="access_details.php?student='.$studentId.'&course='.$courseCode.'&origin='.$origin.'&cid='
         .$courseId.'&id_session='.$sessionId.'">'
-        .Display::return_icon('statistics.png', get_lang('Access details'), '', ICON_SIZE_MEDIUM)
+        .Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Access details'))
         .'</a>';
 }
 
@@ -755,36 +759,26 @@ if ($notebookTeacherEnable && !empty($studentId) && !empty($courseCode)) {
     // link notebookteacher
     $optionsLink = 'student_id='.$studentId.'&origin='.$origin.'&cid='.$courseId.'&id_session='.$sessionId;
     $actions .= '<a href="'.api_get_path(WEB_PLUGIN_PATH).'notebookteacher/src/index.php?'.$optionsLink.'">'
-        .Display::return_icon('notebookteacher.png', get_lang('Notebook'), '', ICON_SIZE_MEDIUM)
+        .Display::getMdiIcon(ToolIcon::NOTEBOOK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Notebook'))
         .'</a>';
 }
 
 if (api_can_login_as($studentId)) {
     $actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_list.php?action=login_as&user_id='.$studentId
         .'&sec_token='.$token.'">'
-        .Display::return_icon('login_as.png', get_lang('Login as'), null, ICON_SIZE_MEDIUM).'</a>&nbsp;&nbsp;';
+        .Display::getMdiIcon(ActionIcon::LOGIN_AS, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Login as')).'</a>&nbsp;&nbsp;';
 }
 
 if (SkillModel::isAllowed($studentId, false)) {
     $actions .= Display::url(
-        Display::return_icon(
-            'skill-badges.png',
-            get_lang('Assign skill'),
-            null,
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ObjectIcon::BADGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Assign skill')),
         api_get_path(WEB_CODE_PATH).'skills/assign.php?'.http_build_query(['user' => $studentId])
     );
 }
 
 if (SkillModel::isAllowed($studentId, false)) {
     $actions .= Display::url(
-        Display::return_icon(
-            'attendance.png',
-            get_lang('CountDoneAttendance'),
-            null,
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ObjectIcon::ATTENDANCE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CountDoneAttendance')),
         api_get_path(WEB_CODE_PATH).'my_space/myStudents.php?action=all_attendance&student='.$studentId
     );
 }
@@ -797,12 +791,7 @@ $permissions = StudentFollowUpPlugin::getPermissions(
 $isAllow = $permissions['is_allow'];
 if ($isAllow) {
     $actions .= Display::url(
-        Display::return_icon(
-            'blog.png',
-            get_lang('Blog'),
-            null,
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ToolIcon::BLOG, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Blog')),
         api_get_path(WEB_PLUGIN_PATH).'studentfollowup/posts.php?student_id='.$studentId
     );
 }
@@ -980,12 +969,12 @@ if ('true' === api_get_setting('allow_terms_conditions')) {
             $studentId,
             'legal_accept'
         );
-        $icon = Display::return_icon('accept_na.png');
+        $icon = Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon-disabled', null, ICON_SIZE_SMALL);
         $legalTime = null;
 
         if (isset($value['value']) && !empty($value['value'])) {
             [$legalId, $legalLanguageId, $legalTime] = explode(':', $value['value']);
-            $icon = Display::return_icon('accept.png');
+            $icon = Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL);
             $btn = Display::url(
                 get_lang('Delete legal agreement'),
                 api_get_self().'?action=delete_legal&student='.$studentId.'&course='.$courseCode,
@@ -1243,7 +1232,7 @@ if (empty($details)) {
         $access_start_date = '';
         $access_end_date = '';
         $date_session = '';
-        $title = Display::return_icon('course.png', get_lang('Courses')).' '.get_lang('Courses');
+        $title = Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Courses')).' '.get_lang('Courses');
 
         $session_info = api_get_session_info($sId);
         if ($session_info) {
@@ -1259,7 +1248,7 @@ if (empty($details)) {
             if (!empty($access_start_date) && !empty($access_end_date)) {
                 $date_session = get_lang('From').' '.$access_start_date.' '.get_lang('Until').' '.$access_end_date;
             }
-            $title = Display::return_icon('session.png', get_lang('Session'))
+            $title = Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Session'))
                 .' '.$session_name.($date_session ? ' ('.$date_session.')' : '');
         }
 
@@ -1440,11 +1429,11 @@ if (empty($details)) {
                         echo '<td><a href="'.api_get_self().'?student='.$studentId
                             .'&details=true&cid='.$courseId.'&id_coach='.$coachId.'&origin='.$origin
                             .'&sid='.$sId.'#infosStudent">'
-                            .Display::return_icon('2rightarrow.png', get_lang('Details')).'</a></td>';
+                            .Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'</a></td>';
                     } else {
                         echo '<td width="10"><a href="'.api_get_self().'?student='.$studentId
                             .'&details=true&cid='.$courseId.'&origin='.$origin.'&sid='.$sId.'#infosStudent">'
-                            .Display::return_icon('2rightarrow.png', get_lang('Details')).'</a></td>';
+                            .Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'</a></td>';
                     }
                     echo '</tr>';
                 }
@@ -1482,7 +1471,7 @@ if (empty($details)) {
             $csv_content[] = $csvRow;
             $exportCourseList[$sId][] = $csvRow;
             $sessionAction = Display::url(
-                Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
+                Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ExportAsCSV')),
                 $currentUrl.'&'
                 .http_build_query(
                     [
@@ -1493,7 +1482,7 @@ if (empty($details)) {
                 )
             );
             $sessionAction .= Display::url(
-                Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
+                Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ExportAsXLS')),
                 $currentUrl.'&'
                 .http_build_query(
                     [
@@ -1506,7 +1495,7 @@ if (empty($details)) {
 
             if (!empty($sId)) {
                 $sessionAction .= Display::url(
-                    Display::return_icon('pdf.png', get_lang('ExportToPDF'), [], ICON_SIZE_MEDIUM),
+                    Display::getMdiIcon(ActionIcon::EXPORT_PDF, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ExportToPDF')),
                     api_get_path(WEB_CODE_PATH).'my_space/session.php?'
                     .http_build_query(
                         [
@@ -1518,7 +1507,7 @@ if (empty($details)) {
                     )
                 );
                 $sessionAction .= Display::url(
-                    Display::return_icon('pdf.png', get_lang('CertificateOfAchievement'), [], ICON_SIZE_MEDIUM),
+                    Display::getMdiIcon(ObjectIcon::CERTIFICATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CertificateOfAchievement')),
                     api_get_path(WEB_CODE_PATH).'my_space/session.php?'
                     .http_build_query(
                         [
@@ -1543,25 +1532,37 @@ if (empty($details)) {
     $columnHeaders = [
         'lp' => get_lang('Learning paths'),
         'time' => get_lang('Time').
-            Display::return_icon(
-                'info3.gif',
-                get_lang('Total time in course'),
-                ['align' => 'absmiddle', 'hspace' => '3px']
+            Display::getMdiIcon(
+                ActionIcon::INFORMATION,
+                'ch-tool-icon',
+                'align: absmiddle; hspace: 3px',
+                ICON_SIZE_SMALL,
+                get_lang('Total time in course')
             ),
         'best_score' => get_lang('Best score'),
         'latest_attempt_avg_score' => get_lang('Latest attempt average score').
-            Display::return_icon(
-                'info3.gif',
-                get_lang('Average is calculated based on the latest attempts'),
-                ['align' => 'absmiddle', 'hspace' => '3px']
+            Display::getMdiIcon(
+                ActionIcon::INFORMATION,
+                'ch-tool-icon',
+                'align: absmiddle; hspace: 3px',
+                ICON_SIZE_SMALL,
+                get_lang('Average is calculated based on the latest attempts')
             ),
         'progress' => get_lang('Progress').
-            Display::return_icon('info3.gif', get_lang('LPProgressScore'), ['align' => 'absmiddle', 'hspace' => '3px']),
+            Display::getMdiIcon(
+                ActionIcon::INFORMATION,
+                'ch-tool-icon',
+                'align: absmiddle; hspace: 3px',
+                ICON_SIZE_SMALL,
+                get_lang('LPProgressScore')
+            ),
         'last_connection' => get_lang('Latest login').
-            Display::return_icon(
-                'info3.gif',
-                get_lang('Last time learner entered the course'),
-                ['align' => 'absmiddle', 'hspace' => '3px']
+            Display::getMdiIcon(
+                ActionIcon::INFORMATION,
+                'ch-tool-icon',
+                'align: absmiddle; hspace: 3px',
+                ICON_SIZE_SMALL,
+                get_lang('Last time learner entered the course')
             ),
     ];
 
@@ -1817,7 +1818,7 @@ if (empty($details)) {
                         $from = '&from=myspace';
                     }
                     $link = Display::url(
-                        Display::return_icon('2rightarrow.png', get_lang('Details')),
+                        Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')),
                         $codePath.'my_space/lp_tracking.php?cid='.$courseId.'&course='.$courseCode.$from.'&origin='.$origin
                         .'&lp_id='.$lp_id.'&student_id='.$studentId.'&sid='.$sessionId
                     );
@@ -1831,7 +1832,7 @@ if (empty($details)) {
                             .$courseCode.'&details='.$details.'&origin='.$origin.'&lp_id='.$lp_id.'&student='
                             .$studentId.'&details=true&sid='.$sessionId;
                         echo Display::url(
-                            Display::return_icon('clean.png', get_lang('Clean')),
+                            Display::getMdiIcon(ActionIcon::RESET, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Clean')),
                             $url,
                             [
                                 'onclick' => "javascript:if(!confirm('"
@@ -1858,10 +1859,12 @@ if (empty($details)) {
         echo '<th>'.get_lang('Tests').'</th>';
         echo '<th>'.get_lang('Learning paths').'</th>';
         echo '<th>'.get_lang('Average score in learning paths').' '.
-            Display::return_icon(
-                'info3.gif',
-                get_lang('Average score'),
-                ['align' => 'absmiddle', 'hspace' => '3px']
+            Display::getMdiIcon(
+                ActionIcon::INFORMATION,
+                'ch-tool-icon',
+                'align: absmiddle; hspace: 3px',
+                ICON_SIZE_SMALL,
+                get_lang('Average score')
             ).'</th>';
         echo '<th>'.get_lang('Attempts').'</th>';
         echo '<th>'.get_lang('LatestAttempt').'</th>';
@@ -2022,7 +2025,7 @@ if (empty($details)) {
                             .'&sid='.$sessionId.'&student='.$studentId.'&origin='
                             .(empty($origin) ? 'tracking' : $origin).$qualifyLink;
                         echo Display::url(
-                            Display::return_icon('quiz.png', get_lang('Test')),
+                            Display::getMdiIcon(ToolIcon::QUIZ, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Test')),
                             $attemptLink
                         );
                     }
@@ -2034,12 +2037,7 @@ if (empty($details)) {
                     $all_attempt_url = "../exercise/exercise_report.php?id=$exercise_id&"
                         ."cid=".$courseId."&filter_by_user=$studentId&sid=$sessionId";
                     echo Display::url(
-                        Display::return_icon(
-                            'test_results.png',
-                            get_lang('All attempts'),
-                            [],
-                            ICON_SIZE_SMALL
-                        ),
+                        Display::getMdiIcon('format-annotation-plus', 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('All attempts')),
                         $all_attempt_url
                     );
                 }
@@ -2092,19 +2090,9 @@ if (empty($details)) {
                     false,
                     $course->getId()
                 );
-                $survey_done = Display::return_icon(
-                    'accept_na.png',
-                    get_lang('There is no answer for the moment'),
-                    [],
-                    ICON_SIZE_SMALL
-                );
+                $survey_done = Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon-disabled', null, ICON_SIZE_SMALL, get_lang('There is no answer for the moment'));
                 if (in_array($studentId, $user_list)) {
-                    $survey_done = Display::return_icon(
-                        'accept.png',
-                        get_lang('Answered'),
-                        [],
-                        ICON_SIZE_SMALL
-                    );
+                    $survey_done = Display::getMdiIcon(StateIcon::COMPLETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Answered'));
                 }
                 $data = ['title' => $survey['title'], 'done' => $survey_done];
                 $survey_data[] = $data;
diff --git a/public/main/my_space/session.php b/public/main/my_space/session.php
index 449d62b734..e669a5a80d 100644
--- a/public/main/my_space/session.php
+++ b/public/main/my_space/session.php
@@ -1,6 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 ob_start();
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
@@ -305,51 +309,51 @@ if (api_is_platform_admin(true, true)) {
 
     if (!api_is_session_admin()) {
         $menu_items[] = Display::url(
-            Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
             api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('user.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
             'index.php?view=drh_students&amp;display=yourstudents'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('teacher.png', get_lang('Teachers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Teachers')),
             'teachers.php'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('course.png', get_lang('Courses'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Courses')),
             'course.php'
         );
         $menu_items[] = Display::url(
-            Display::return_icon('session_na.png', get_lang('Course sessions'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Course sessions')),
             '#'
         );
     } else {
         $menu_items[] = Display::url(
-            Display::return_icon('teacher.png', get_lang('Trainers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Trainers')),
             'session_admin_teachers.php'
         );
     }
 
     $menu_items[] = Display::url(
-        Display::return_icon('works.png', get_lang('Assignments report'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::ASSIGNMENT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Assignments report')),
         api_get_path(WEB_CODE_PATH).'my_space/works_in_session_report.php'
     );
     $menu_items[] = Display::url(
-        Display::return_icon('clock.png', get_lang('Teachers time report by session'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::TIME_REPORT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Teachers time report by session')),
         api_get_path(WEB_CODE_PATH).'admin/teachers_time_by_session_report.php'
     );
 
     if (!api_is_session_admin()) {
         $menu_items[] = Display::url(
-            Display::return_icon('1day.png', get_lang('Course sessionsPlanCalendar'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SURVEY_DOODLE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Course sessionsPlanCalendar')),
             api_get_path(WEB_CODE_PATH)."calendar/planification.php"
         );
     }
 
     if (api_is_drh()) {
         $menu_items[] = Display::url(
-            Display::return_icon('session.png', get_lang('SessionFilterReport'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('SessionFilterReport')),
             api_get_path(WEB_CODE_PATH).'my_space/session_filter.php'
         );
     }
@@ -364,12 +368,12 @@ if (api_is_platform_admin(true, true)) {
     $actionsRight = '';
     if (count($a_sessions) > 0) {
         $actionsRight = Display::url(
-            Display::return_icon('printer.png', get_lang('Print'), [], 32),
+            Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
             'javascript: void(0);',
             ['onclick' => 'javascript: window.print();']
         );
         $actionsRight .= Display::url(
-            Display::return_icon('export_csv.png', get_lang('CSV export'), [], 32),
+            Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')),
             api_get_self().'?export=csv'
         );
     }
@@ -380,7 +384,7 @@ if (api_is_platform_admin(true, true)) {
     echo Display::page_header(get_lang('Your sessions'));
 } elseif (api_is_teacher()) {
     $actionsRight = Display::url(
-        Display::return_icon('clock.png', get_lang('Teachers time report by session'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::TIME_REPORT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Teachers time report by session')),
         api_get_path(WEB_CODE_PATH).'admin/teachers_time_by_session_report.php'
     );
 
diff --git a/public/main/my_space/session_admin_teachers.php b/public/main/my_space/session_admin_teachers.php
index f35ab5bb4e..327f65cc42 100644
--- a/public/main/my_space/session_admin_teachers.php
+++ b/public/main/my_space/session_admin_teachers.php
@@ -5,6 +5,11 @@
 /**
  * Teacher report.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -158,7 +163,7 @@ function get_users($from, $limit, $column, $direction)
         $row[] = $string_date;
 
         $detailsLink = Display::url(
-            Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
+            Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details').' '.$student_data['username']),
             $urlDetails,
             ['id' => 'details_'.$student_data['username']]
         );
@@ -180,17 +185,17 @@ $actionsLeft = '';
 if (api_is_drh()) {
     $menu_items = [
         Display::url(
-            Display::return_icon('statistics.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('MyStats')),
             api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
         ),
-        Display::url(Display::return_icon('user.png', get_lang('Students'), [], ICON_SIZE_MEDIUM), 'student.php'),
+        Display::url(Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Students')), 'student.php'),
         Display::url(
-            Display::return_icon('teacher_na.png', get_lang('Trainers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Trainers')),
             'teachers.php'
         ),
-        Display::url(Display::return_icon('course.png', get_lang('Courses'), [], ICON_SIZE_MEDIUM), 'course.php'),
+        Display::url(Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Courses')), 'course.php'),
         Display::url(
-            Display::return_icon('session.png', get_lang('Sessions'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Sessions')),
             'session.php'
         ),
     ];
@@ -204,12 +209,12 @@ if (api_is_drh()) {
 }
 
 $actionsRight = Display::url(
-    Display::return_icon('printer.png', get_lang('Print'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
     'javascript: void(0);',
     ['onclick' => 'javascript: window.print();']
 );
 $actionsRight .= Display::url(
-    Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ExportAsCSV')),
     api_get_self().'?export=csv&keyword='.$keyword
 );
 
diff --git a/public/main/my_space/session_filter.php b/public/main/my_space/session_filter.php
index e886ba7808..e594f6c193 100644
--- a/public/main/my_space/session_filter.php
+++ b/public/main/my_space/session_filter.php
@@ -5,6 +5,9 @@
 /**
  * Report for current courses followed by the user.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_TRACKING;
@@ -330,20 +333,20 @@ Display::display_header(get_lang('CertificatesSessions'));
 echo Display::page_header(get_lang('CertificatesSessions'));
 $actions = '';
 $actions .= Display::url(
-    Display::return_icon('back.png', get_lang('Back'), [], 32),
+    Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Back')),
     api_get_path(WEB_CODE_PATH).'my_space'
 );
 
 if ($allowCustomCertificate) {
     $url = api_get_path(WEB_PLUGIN_PATH).'customcertificate/src/export_pdf_all_in_one.php';
     $actions .= Display::url(
-        Display::return_icon('pdf.png', get_lang('ExportAllCertificatesToPDF'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ActionIcon::EXPORT_PDF, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ExportAllCertificatesToPDF')),
         $url,
         ['id' => 'export_pdf']
     );
 
     $actions .= Display::url(
-        Display::return_icon('file_zip.png', get_lang('ExportAllCertificatesToZIP'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ActionIcon::DOWNLOAD_MULTIPLE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('ExportAllCertificatesToZIP')),
         $url,
         ['id' => 'export_zip']
     );
@@ -392,7 +395,7 @@ if (0 == count($certificateList)) {
 
             $url .= '&action=export';
             $pdf = Display::url(
-                Display::return_icon('pdf.png', get_lang('Download')),
+                Display::getMdiIcon(ActionIcon::EXPORT_PDF, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Download')),
                 $url,
                 ['target' => '_blank']
             );
@@ -404,7 +407,7 @@ if (0 == count($certificateList)) {
                 '&action=delete'.
                 '&cat_id='.$categoryId.
                 '&certificate_id='.$valueCertificate['id'].'">
-                    '.Display::return_icon('delete.png', get_lang('Delete')).'
+                    '.Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).'
                   </a>'.PHP_EOL;
             echo '</td></tr>';
         }
diff --git a/public/main/my_space/student.php b/public/main/my_space/student.php
index d4ea8f8407..e67e5e5124 100644
--- a/public/main/my_space/student.php
+++ b/public/main/my_space/student.php
@@ -5,6 +5,11 @@
 /**
  * Report on students subscribed to courses I am teaching.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -198,7 +203,7 @@ function get_users($from, $limit, $column, $direction)
         $row[] = $string_date;
 
         $detailsLink = Display::url(
-            Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
+            Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details').' '.$student_data['username']),
             $urlDetails,
             ['id' => 'details_'.$student_data['username']]
         );
@@ -206,7 +211,7 @@ function get_users($from, $limit, $column, $direction)
         $lostPasswordLink = '';
         if (api_is_drh() || api_is_platform_admin()) {
             $lostPasswordLink = '&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')),
                     $webCodePath.'my_space/user_edit.php?user_id='.$student_id
             );
         }
@@ -230,27 +235,27 @@ $actionsLeft = '';
 if (api_is_drh()) {
     $menu_items = [
         Display::url(
-            Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
             $webCodePath.'auth/my_progress.php'
         ),
         Display::url(
-            Display::return_icon('user_na.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
             '#'
         ),
         Display::url(
-            Display::return_icon('teacher.png', get_lang('Teachers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Teachers')),
             'teachers.php'
         ),
         Display::url(
-            Display::return_icon('course.png', get_lang('Courses'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Courses')),
             'course.php'
         ),
         Display::url(
-            Display::return_icon('session.png', get_lang('Course sessions'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Course sessions')),
             'session.php'
         ),
         Display::url(
-            Display::return_icon('skills.png', get_lang('Skills'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::BADGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Skills')),
             $webCodePath.'social/my_skills_report.php'
         ),
     ];
@@ -258,45 +263,40 @@ if (api_is_drh()) {
     $actionsLeft .= implode('', $menu_items);
 } elseif (api_is_student_boss()) {
     $actionsLeft .= Display::url(
-        Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
         $webCodePath.'auth/my_progress.php'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon('user_na.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
         '#'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon('skills.png', get_lang('Skills'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::BADGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Skills')),
         $webCodePath.'social/my_skills_report.php'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon('statistics.png', get_lang('Corporate report'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Corporate report')),
         $webCodePath.'my_space/company_reports.php'
     );
 
     $actionsLeft .= Display::url(
-        Display::return_icon('calendar-user.png', get_lang('MyStudentsSchedule'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::AGENDA, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('MyStudentsSchedule')),
         $webCodePath.'my_space/calendar_plan.php'
     );
 
     $actionsLeft .= Display::url(
-        Display::return_icon(
-            'certificate_list.png',
-            get_lang('GradebookSeeListOfLearnersCertificates'),
-            [],
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ObjectIcon::CERTIFICATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('GradebookSeeListOfLearnersCertificates')),
         $webCodePath.'gradebook/certificate_report.php'
     );
 }
 
 $actionsRight = Display::url(
-    Display::return_icon('printer.png', get_lang('Print'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
     'javascript: void(0);',
     ['onclick' => 'javascript: window.print();']
 );
 $actionsRight .= Display::url(
-    Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')),
     api_get_self().'?export=csv&keyword='.$keyword
 );
 
diff --git a/public/main/my_space/teachers.php b/public/main/my_space/teachers.php
index d482b279e4..24544833bd 100644
--- a/public/main/my_space/teachers.php
+++ b/public/main/my_space/teachers.php
@@ -5,6 +5,11 @@
 /**
  * Teacher report.
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -171,7 +176,7 @@ function get_users($from, $limit, $column, $direction)
         $row[] = $string_date;
 
         $detailsLink = Display::url(
-            Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
+            Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details').' '.$student_data['username']),
             $urlDetails,
             ['id' => 'details_'.$student_data['username']]
         );
@@ -193,17 +198,17 @@ $actionsLeft = '';
 if (api_is_drh()) {
     $menu_items = [
         Display::url(
-            Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
             api_get_path(WEB_CODE_PATH).'auth/my_progress.php'
         ),
-        Display::url(Display::return_icon('user.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM), 'student.php'),
+        Display::url(Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Learners')), 'student.php'),
         Display::url(
-            Display::return_icon('teacher_na.png', get_lang('Trainers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Trainers')),
             'teachers.php'
         ),
-        Display::url(Display::return_icon('course.png', get_lang('Courses'), [], ICON_SIZE_MEDIUM), 'course.php'),
+        Display::url(Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Courses')), 'course.php'),
         Display::url(
-            Display::return_icon('session.png', get_lang('Course sessions'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Course sessions')),
             'session.php'
         ),
     ];
@@ -218,12 +223,12 @@ if (api_is_drh()) {
 
 $actionsRight = '';
 $actionsRight .= Display::url(
-    Display::return_icon('printer.png', get_lang('Print'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
     'javascript: void(0);',
     ['onclick' => 'javascript: window.print();']
 );
 $actionsRight .= Display::url(
-    Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')),
     api_get_self().'?export=csv&keyword='.$keyword
 );
 
diff --git a/public/main/my_space/users.php b/public/main/my_space/users.php
index 0b353eecfa..9b6af8e880 100644
--- a/public/main/my_space/users.php
+++ b/public/main/my_space/users.php
@@ -4,6 +4,11 @@
 /**
  * Report on users followed (filtered by status given in URL).
  */
+
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ToolIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -181,10 +186,10 @@ function get_users($from, $limit, $column, $direction)
 
         if (isset($_GET['id_coach']) && 0 != intval($_GET['id_coach'])) {
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
-				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
+				            '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'</a>';
         } else {
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
-				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
+				            '.Display::getMdiIcon(ActionIcon::VIEW_DETAILS, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Details')).'</a>';
         }
 
         $row[] = $detailsLink;
@@ -206,27 +211,27 @@ $actionsLeft = '';
 if (api_is_drh()) {
     $menu_items = [
         Display::url(
-            Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
             $webCodePath.'auth/my_progress.php'
         ),
         Display::url(
-            Display::return_icon('user_na.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
             '#'
         ),
         Display::url(
-            Display::return_icon('teacher.png', get_lang('Trainers'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::TEACHER, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Trainers')),
             'teachers.php'
         ),
         Display::url(
-            Display::return_icon('course.png', get_lang('Courses'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::COURSE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Courses')),
             'course.php'
         ),
         Display::url(
-            Display::return_icon('session.png', get_lang('Course sessions'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::SESSION, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Course sessions')),
             'session.php'
         ),
         Display::url(
-            Display::return_icon('skills.png', get_lang('Skills'), [], ICON_SIZE_MEDIUM),
+            Display::getMdiIcon(ObjectIcon::BADGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Skills')),
             $webCodePath.'social/my_skills_report.php'
         ),
     ];
@@ -239,39 +244,34 @@ if (api_is_drh()) {
     }
 } elseif (api_is_student_boss()) {
     $actionsLeft .= Display::url(
-        Display::return_icon('statistics.png', get_lang('View my progress'), '', ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('View my progress')),
         $webCodePath.'auth/my_progress.php'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon('user_na.png', get_lang('Learners'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::USER, 'ch-tool-icon-disabled', null, ICON_SIZE_MEDIUM, get_lang('Learners')),
         '#'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon('skills.png', get_lang('Skills'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ObjectIcon::BADGE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Skills')),
         $webCodePath.'social/my_skills_report.php'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon('statistics.png', get_lang("Corporate report"), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ToolIcon::TRACKING, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang("Corporate report")),
         $webCodePath.'my_space/company_reports.php'
     );
     $actionsLeft .= Display::url(
-        Display::return_icon(
-            'certificate_list.png',
-            get_lang('GradebookSeeListOfLearnersCertificates'),
-            [],
-            ICON_SIZE_MEDIUM
-        ),
+        Display::getMdiIcon(ObjectIcon::CERTIFICATE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('GradebookSeeListOfLearnersCertificates')),
         $webCodePath.'gradebook/certificate_report.php'
     );
 }
 
 $actionsRight = Display::url(
-    Display::return_icon('printer.png', get_lang('Print'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::PRINT, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Print')),
     'javascript: void(0);',
     ['onclick' => 'javascript: window.print();']
 );
 $actionsRight .= Display::url(
-    Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM),
+    Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')),
     api_get_self().'?export=csv&keyword='.$keyword
 );
 
diff --git a/public/main/my_space/works_in_session_report.php b/public/main/my_space/works_in_session_report.php
index e34d018036..3c5ec42132 100644
--- a/public/main/my_space/works_in_session_report.php
+++ b/public/main/my_space/works_in_session_report.php
@@ -5,6 +5,7 @@
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
 
 require_once __DIR__.'/../inc/global.inc.php';
 
@@ -153,11 +154,11 @@ $actions = null;
 
 if ($session) {
     $actions = Display::url(
-        Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('CSV export')),
         api_get_self().'?'.http_build_query(['export' => 'csv', 'session' => $session->getId()])
     );
     $actions .= Display::url(
-        Display::return_icon('export_excel.png', get_lang('Excel export'), [], ICON_SIZE_MEDIUM),
+        Display::getMdiIcon(ActionIcon::EXPORT_SPREADSHEET, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Excel export')),
         api_get_self().'?'.http_build_query(['export' => 'xls', 'session' => $session->getId()])
     );
 }
diff --git a/public/main/template/default/my_space/user_details.html.twig b/public/main/template/default/my_space/user_details.html.twig
index a656c70d5c..c62570fa11 100644
--- a/public/main/template/default/my_space/user_details.html.twig
+++ b/public/main/template/default/my_space/user_details.html.twig
@@ -2,7 +2,7 @@
 
 {% autoescape false %}
 {% if title is defined %}
-    <h2 class="details-title"><img src="{{ 'course.png'|icon(32) }}"> {{ title }}</h2>
+    <h2 class="details-title">{{ 'book-open-page-variant'|mdi_icon(32) }} {{ title }}</h2>
 {% endif %}
 
 <div class="page-header">