diff --git a/public/main/skills/skill_badge.php b/public/main/skills/skill_badge.php
index fca4fcca0b..2c083422ee 100644
--- a/public/main/skills/skill_badge.php
+++ b/public/main/skills/skill_badge.php
@@ -5,6 +5,9 @@
  *
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  */
+
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -29,12 +32,7 @@ $interbreadcrumb = [
 ];
 
 $toolbar = Display::url(
-    Display::return_icon(
-        'list_badges.png',
-        get_lang('Manage skills'),
-        null,
-        ICON_SIZE_MEDIUM
-    ),
+    Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage skills')),
     api_get_path(WEB_CODE_PATH).'skills/skill_list.php',
     ['title' => get_lang('Manage skills')]
 );
diff --git a/public/main/skills/skill_badge_list.php b/public/main/skills/skill_badge_list.php
index 03aaa67132..183d12c4d4 100644
--- a/public/main/skills/skill_badge_list.php
+++ b/public/main/skills/skill_badge_list.php
@@ -8,6 +8,9 @@
  *
  * @deprecated use skill_list.php
  */
+
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 $cidReset = true;
 
 require_once __DIR__.'/../inc/global.inc.php';
@@ -32,12 +35,7 @@ $interbreadcrumb = [
 ];
 
 $toolbar = Display::url(
-    Display::return_icon(
-        'list_badges.png',
-        get_lang('Manage skills'),
-        null,
-        ICON_SIZE_MEDIUM
-    ),
+    Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage skills')),
     api_get_path(WEB_CODE_PATH).'skills/skill_list.php',
     ['title' => get_lang('Manage skills')]
 );
diff --git a/public/main/skills/skill_level.php b/public/main/skills/skill_level.php
index 303ed678b2..c0a93cfe7b 100644
--- a/public/main/skills/skill_level.php
+++ b/public/main/skills/skill_level.php
@@ -3,7 +3,8 @@
 
 use Chamilo\CoreBundle\Entity\Level;
 use Chamilo\CoreBundle\Entity\Profile;
-
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 /**
  * Add a skill Level.
  */
@@ -82,12 +83,7 @@ switch ($action) {
             exit;
         }
         $toolbarAction = Display::url(
-            Display::return_icon(
-                'list_badges.png',
-                get_lang('List'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('List')),
             $listAction,
             ['title' => get_lang('List')]
         );
@@ -95,12 +91,7 @@ switch ($action) {
     case 'edit':
         $formToDisplay = $form->returnForm();
         $toolbarAction = Display::url(
-            Display::return_icon(
-                'list_badges.png',
-                get_lang('List'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('List')),
             $listAction,
             ['title' => get_lang('List')]
         );
@@ -123,12 +114,7 @@ switch ($action) {
         break;
     case 'delete':
         $toolbarAction = Display::url(
-            Display::return_icon(
-                'list_badges.png',
-                get_lang('List'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('List')),
             $listAction,
             ['title' => get_lang('List')]
         );
@@ -143,12 +129,7 @@ switch ($action) {
         break;
     default:
         $toolbarAction = 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().'?action=add',
             ['title' => get_lang('Add')]
         );
diff --git a/public/main/skills/skill_list.php b/public/main/skills/skill_list.php
index 6a1557e22e..605c29709e 100644
--- a/public/main/skills/skill_list.php
+++ b/public/main/skills/skill_list.php
@@ -4,6 +4,8 @@
 
 use Chamilo\CoreBundle\Entity\Skill;
 use Chamilo\CoreBundle\Framework\Container;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 
 /**
  * Skill list for management.
@@ -117,34 +119,19 @@ switch ($action) {
         $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('Administration')];
 
         $toolbar = Display::url(
-            Display::return_icon(
-                'add.png',
-                get_lang('Create skill'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Create skill')),
             api_get_path(WEB_CODE_PATH).'skills/skill_create.php',
             ['title' => get_lang('Create skill')]
         );
 
         $toolbar .= Display::url(
-            Display::return_icon(
-                'wheel_skill.png',
-                get_lang('Skills wheel'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::WHEEL, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Skills wheel')),
             api_get_path(WEB_CODE_PATH).'skills/skills_wheel.php',
             ['title' => get_lang('Skills wheel')]
         );
 
         $toolbar .= Display::url(
-            Display::return_icon(
-                'import_csv.png',
-                get_lang('Import skills from a CSV file'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ActionIcon::IMPORT_ARCHIVE, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Import skills from a CSV file')),
             api_get_path(WEB_CODE_PATH).'skills/skills_import.php',
             ['title' => get_lang('Import skills from a CSV file')]
         );
diff --git a/public/main/skills/skill_profile.php b/public/main/skills/skill_profile.php
index d973b24aa7..8c1250ea8d 100644
--- a/public/main/skills/skill_profile.php
+++ b/public/main/skills/skill_profile.php
@@ -5,6 +5,9 @@
 use Chamilo\CoreBundle\Entity\Level;
 use Chamilo\CoreBundle\Entity\Profile;
 use Chamilo\CoreBundle\Entity\Skill;
+use Chamilo\CoreBundle\Component\Utils\ActionIcon;
+use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
+
 
 /**
  * Add a skill Profile.
@@ -96,12 +99,7 @@ switch ($action) {
             exit;
         }
         $toolbar = Display::url(
-            Display::return_icon(
-                'list_badges.png',
-                get_lang('List'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('List')),
             $listAction,
             ['title' => get_lang('List')]
         );
@@ -109,12 +107,7 @@ switch ($action) {
     case 'edit':
         $tpl->assign('form', $formToDisplay);
         $toolbar = Display::url(
-            Display::return_icon(
-                'list_badges.png',
-                get_lang('List'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('List')),
             $listAction,
             ['title' => get_lang('List')]
         );
@@ -132,12 +125,7 @@ switch ($action) {
         break;
     case 'delete':
         $toolbar = Display::url(
-            Display::return_icon(
-                'list_badges.png',
-                get_lang('List'),
-                null,
-                ICON_SIZE_MEDIUM
-            ),
+            Display::getMdiIcon(ObjectIcon::LIST, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('List')),
             $listAction,
             ['title' => get_lang('List')]
         );
@@ -154,12 +142,7 @@ switch ($action) {
         break;
     default:
         $toolbar = 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().'?action=add',
             ['title' => get_lang('Add')]
         );
diff --git a/public/main/skills/skills_gradebook.php b/public/main/skills/skills_gradebook.php
index 4a931babf3..91bcadc276 100644
--- a/public/main/skills/skills_gradebook.php
+++ b/public/main/skills/skills_gradebook.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';
 
@@ -92,9 +94,12 @@ $extra_params['autowidth'] = 'true';
 //height auto
 $extra_params['height'] = 'auto';
 
-$iconAdd = Display::return_icon('add.png', addslashes(get_lang('Add skill')));
-$iconAddNa = Display::return_icon(
-    'add_na.png',
+$iconAdd = Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_SMALL, addslashes(get_lang('Add skill')));
+$iconAddNa = Display::getMdiIcon(
+    ActionIcon::ADD,
+    'ch-tool-icon-disabled',
+    null,
+    ICON_SIZE_SMALL,
     addslashes(get_lang('Your gradebook first needs a certificate in order to be linked to a skill'))
 );