diff --git a/assets/css/app.scss b/assets/css/app.scss
index f65ab79b7b..382aa68adb 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -255,211 +255,6 @@
   text-decoration: underline;
 }
 
-#skillList .header-title{
-  padding: 8px;
-  border-bottom: 2px solid #ddd;
-  font-weight: bold;
-  margin-bottom: 15px;
-}
-.skills-badges{
-  display: grid;
-  grid-gap: 1rem;
-  grid-row-gap: 16px;
-  grid-template-columns: repeat(6, 1fr);
-}
-.skills-badges .item{
-  display: inline-block;
-  width: 100%;
-  text-align: center;
-  justify-content: center;
-  align-items: center;
-}
-.skills-badges a .caption{
-  text-align: center;
-}
-.list-horizontal .list-skills{
-  display: grid;
-  grid-gap: 1rem;
-  grid-row-gap: 16px;
-  grid-template-columns: repeat(4, 1fr);
-}
-.list-vertical .list-skills{
-  display: grid;
-  grid-gap: 1rem;
-  grid-row-gap: 16px;
-  grid-template-columns: repeat(2, 1fr);
-}
-.list-skills .item{
-  display: inline-block;
-  width: 100%;
-  text-align: center;
-  justify-content: center;
-  align-items: center;
-}
-.skill-options .legend {
-  border: 1px dashed #cccccc;
-  padding: 1em;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-  margin-bottom: 1em;
-  margin-top: 1em;
-  background-color: #FFFFFF;
-}
-
-.skill-options .skill-home {
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
-.skill-options .btn-block {
-  box-sizing: border-box;
-  display: block;
-  padding-left: 0;
-  padding-right: 0;
-  width: 100%;
-}
-
-.skill-options .accordion-inner {
-  padding: 9px 15px;
-  /*border: 1px solid #dadada;*/
-  background-color: #FFFFFF;
-}
-
-.skill-options .load_wheel {
-}
-
-.skill-options .skill-winner {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.skill-options .skill-winner li {
-  float: left;
-  margin-right: 1em;
-  padding-bottom: 1em;
-}
-
-.skill-options .skill-winner li a {
-  /*background: url("/main/img/icons/16/winner.png") no-repeat;*/
-  padding-left: 1.5em;
-  padding-bottom: 1em;
-}
-
-.search-skill ul.holder li.bit-input input {
-  width: 100%;
-}
-
-.skill-legend-basic {
-  color: #3A87AD;
-}
-
-.skill-legend-add {
-  color: #F89406;
-}
-
-.skill-legend-search {
-  color: #B94A48;
-}
-
-.skill-legend-badges {
-  color: #31A354;
-}
-
-.page-skill .panel-default {
-  border-color: #DDDDDD;
-}
-
-.page-skill .btn-default {
-  background-color: #F6F6F6;
-}
-
-.page-skill .btn-default:hover {
-  background-color: #E6E6E6;
-}
-
-.page-skill #skill_info {
-  font-size: 12px;
-}
-
-.page-skill #skill_wheel tspan {
-  font-size: 12px;
-}
-
-.page-skill .holder_simple li.bit-box a {
-  color: #8A6D3B;
-}
-
-.skill_partition {
-  cursor: pointer;
-  stroke: #000000;
-  stroke-width: 0.5px;
-}
-
-.items-user .avatar-user {
-  text-align: center;
-  margin-bottom: 10px;
-}
-
-.items-user p {
-  font-size: 12px;
-  margin-bottom: 5px;
-}
-
-.items-user .list-group {
-  font-size: 12px;
-}
-
-table#skill_holder {
-  margin-top: 15px;
-}
-
-.badges-sidebar {
-  height: 250px;
-}
-
-.panel figure figcaption {
-  background: none;
-  text-align: center;
-}
-
-.skill_root {
-  box-shadow: 2px 2px 19px #aaa;
-  border-radius: 6px;
-  background-color: #ccc;
-  border: 0.1em dotted #D4E06B;
-  color: black;
-  font-size: 0.9em;
-  height: 4em;
-  opacity: 0.8;
-  padding-top: 0.9em;
-  text-align: center;
-  width: 120px;
-  z-index: 40;
-  position: relative;
-}
-
-.skill_child {
-  box-shadow: 2px 2px 19px #aaa;
-  border-radius: 6px;
-  background-color: white;
-  border: 0.1em dotted #D4E06B;
-  color: black;
-  font-size: 0.9em;
-  height: 4em;
-  opacity: 0.8;
-  padding-top: 0.9em;
-  text-align: center;
-  width: 120px;
-  z-index: 40;
-  float: left;
-  margin-left: 20px;
-  margin-bottom: 20px;
-  margin-top: 10px;
-  position: relative;
-}
-
 .category-forum .custom-panel-group {
   width: 100%;
 }
diff --git a/assets/css/scss/index.scss b/assets/css/scss/index.scss
index 1053d94406..d9bbde06fe 100755
--- a/assets/css/scss/index.scss
+++ b/assets/css/scss/index.scss
@@ -72,3 +72,4 @@
 @import 'lp';
 @import "userreluser";
 @import 'social';
+@import 'skill';
diff --git a/assets/vue/components/social/MySkillsCard.vue b/assets/vue/components/social/MySkillsCard.vue
index 9f6dd1ea1d..7a40899dc2 100644
--- a/assets/vue/components/social/MySkillsCard.vue
+++ b/assets/vue/components/social/MySkillsCard.vue
@@ -13,10 +13,10 @@
           <div class="skill-name">{{ skill.name }}</div>
         </div>
       </div>
-      <!--div class="skills-links mt-2">
+      <div class="skills-links mt-2">
         <a href="/main/social/skills_wheel.php">{{ t('Skills Wheel') }}</a> |
         <a href="/main/social/skills_ranking.php">{{ t('Your skill ranking') }}</a>
-      </div-->
+      </div>
     </div>
     <div v-else>
       <p>{{ t('Without achieved skills') }}</p>
diff --git a/public/main/inc/lib/SkillModel.php b/public/main/inc/lib/SkillModel.php
index 9de3b044e8..ea1c3cd1fc 100644
--- a/public/main/inc/lib/SkillModel.php
+++ b/public/main/inc/lib/SkillModel.php
@@ -1286,12 +1286,12 @@ class SkillModel extends Model
      */
     public function getCountSkillsByCourse($courseCode)
     {
-        $courseCode = Database::escape_string($courseCode);
+        $cid = api_get_course_int_id($courseCode);
         $sql = "SELECT count(skill_id) as count
                 FROM {$this->table_gradebook} g
                 INNER JOIN {$this->table_skill_rel_gradebook} sg
                 ON g.id = sg.gradebook_id
-                WHERE course_code = '$courseCode'";
+                WHERE c_id = '$cid'";
 
         $result = Database::query($sql);
         if (Database::num_rows($result)) {
diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php
index 27b2f878f3..4e3d585026 100644
--- a/public/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@@ -1334,6 +1334,47 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
         $result['avatar_no_query'] = '';
         $result['avatar_small'] = '';
         $result['avatar_medium'] = '';
+
+        if (empty($user['avatar'])) {
+            $originalFile = UserManager::getUserPicture(
+                $user_id,
+                USER_IMAGE_SIZE_ORIGINAL,
+                null,
+                $result
+            );
+            $result['avatar'] = $originalFile;
+            $avatarString = explode('?', $result['avatar']);
+            $result['avatar_no_query'] = reset($avatarString);
+        } else {
+            $result['avatar'] = $user['avatar'];
+            $avatarString = explode('?', $user['avatar']);
+            $result['avatar_no_query'] = reset($avatarString);
+        }
+
+        if (!isset($user['avatar_small'])) {
+            $smallFile = UserManager::getUserPicture(
+                $user_id,
+                USER_IMAGE_SIZE_SMALL,
+                null,
+                $result
+            );
+            $result['avatar_small'] = $smallFile;
+        } else {
+            $result['avatar_small'] = $user['avatar_small'];
+        }
+
+        if (!isset($user['avatar_medium'])) {
+            $mediumFile = UserManager::getUserPicture(
+                $user_id,
+                USER_IMAGE_SIZE_MEDIUM,
+                null,
+                $result
+            );
+            $result['avatar_medium'] = $mediumFile;
+        } else {
+            $result['avatar_medium'] = $user['avatar_medium'];
+        }
+
         $urlImg = api_get_path(WEB_IMG_PATH);
         $iconStatus = '';
         $iconStatusMedium = '';
diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index dd7ad868c1..44dafa062c 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -2933,7 +2933,7 @@ class UserManager
             $sessionLimitRestriction = "LIMIT $sessionLimit";
         }
 
-        $sql = "SELECT DISTINCT s.id, name, access_start_date, access_end_date
+        $sql = "SELECT DISTINCT s.id, s.title, access_start_date, access_end_date
                 FROM $tbl_session_user su INNER JOIN $tbl_session s
                 ON (s.id = su.session_id)
                 WHERE (
@@ -2941,7 +2941,7 @@ class UserManager
                     su.relation_type = ".SessionEntity::STUDENT."
                 )
                 $coachCourseConditions
-                ORDER BY access_start_date, access_end_date, name
+                ORDER BY access_start_date, access_end_date, s.title
                 $sessionLimitRestriction
         ";
 
@@ -3042,7 +3042,7 @@ class UserManager
                 access_start_date,
                 access_end_date,
                 session.id as session_id,
-                session.name as session_name,
+                session.title as session_name,
                 IF((session_course_user.user_id = 3 AND session_course_user.status = ".SessionEntity::COURSE_COACH."),'2', '5')
             FROM $tbl_session_course_user as session_course_user
             INNER JOIN $tbl_course AS course
diff --git a/public/main/social/skills_ranking.php b/public/main/social/skills_ranking.php
index c5f97752ca..4586740e5c 100644
--- a/public/main/social/skills_ranking.php
+++ b/public/main/social/skills_ranking.php
@@ -33,52 +33,52 @@ $column_model = [
     [
         'name' => 'photo',
         'index' => 'photo',
-        'width' => '10',
+        'width' => '150px',
         'align' => 'center',
         'sortable' => 'false',
     ],
     [
         'name' => 'firstname',
         'index' => 'firstname',
-        'width' => '70',
+        'width' => '250px',
         'align' => 'center',
         'sortable' => 'false',
     ],
     [
         'name' => 'lastname',
         'index' => 'lastname',
-        'width' => '70',
+        'width' => '250px',
         'align' => 'center',
         'sortable' => 'false',
     ],
     [
         'name' => 'skills_acquired',
         'index' => 'skills_acquired',
-        'width' => '30	',
+        'width' => '100px',
         'align' => 'center',
         'sortable' => 'false',
     ],
     [
         'name' => 'currently_learning',
         'index' => 'currently_learning',
-        'width' => '30',
+        'width' => '150px',
         'align' => 'center',
         'sortable' => 'false',
     ],
     [
         'name' => 'rank',
         'index' => 'rank',
-        'width' => '30',
+        'width' => '100px',
         'align' => 'center',
         'sortable' => 'false',
     ],
 ];
 
 //Autowidth
-$extra_params['autowidth'] = 'true';
+//$extra_params['autowidth'] = 'true';
 
 //height auto
-$extra_params['height'] = 'auto';
+//$extra_params['height'] = 'auto';
 //$extra_params['excel'] = 'excel';
 //$extra_params['rowList'] = array(10, 20 ,30);
 
@@ -87,7 +87,7 @@ $jqgrid = Display::grid_js(
     $url,
     $columns,
     $column_model,
-    $extra_params,
+    [],
     [],
     null,
     true
diff --git a/public/main/social/skills_wheel.php b/public/main/social/skills_wheel.php
index ce88773caa..63d7916603 100644
--- a/public/main/social/skills_wheel.php
+++ b/public/main/social/skills_wheel.php
@@ -21,7 +21,7 @@ $htmlHeadXtra[] = api_get_js('skills.js');
 $tpl = new Template(null, false, false);
 
 $userId = api_get_user_id();
-$userInfo = api_get_user_info();
+$userInfo = api_get_user_info($userId);
 
 $skill = new SkillModel();
 $ranking = $skill->getUserSkillRanking($userId);
diff --git a/public/main/template/default/skill/skill_wheel_student.html.twig b/public/main/template/default/skill/skill_wheel_student.html.twig
index dd4ffac712..dc4d445562 100644
--- a/public/main/template/default/skill/skill_wheel_student.html.twig
+++ b/public/main/template/default/skill/skill_wheel_student.html.twig
@@ -1,7 +1,59 @@
 {% include '@ChamiloCore/Skill/skill_wheel.js.html.twig' %}
 {% autoescape false %}
-<script>
-    /* Skill search input in the left menu */
+    <script>
+      document.addEventListener('DOMContentLoaded', function () {
+        var accordionLinks = document.querySelectorAll('[data-toggle="collapse"]');
+        accordionLinks.forEach(function(link) {
+          link.addEventListener('click', function(event) {
+            event.preventDefault();
+
+            var collapseTargetId = this.getAttribute('href');
+            var collapseTarget = document.querySelector(collapseTargetId);
+
+            if (collapseTarget.classList.contains('in')) {
+              collapseTarget.classList.remove('in');
+            } else {
+              var parentAccordionId = this.getAttribute('data-parent');
+              var parentAccordion = document.querySelector(parentAccordionId);
+              var allPanels = parentAccordion.querySelectorAll('.panel-collapse');
+
+              allPanels.forEach(function(panel) {
+                panel.classList.remove('in');
+              });
+
+              collapseTarget.classList.add('in');
+            }
+          });
+        });
+
+        var modalToggles = document.querySelectorAll('[data-toggle="modal"]');
+
+        modalToggles.forEach(function(toggle) {
+          toggle.addEventListener('click', function(e) {
+            e.preventDefault();
+            var target = document.querySelector(this.getAttribute('data-target'));
+            target.style.display = 'block';
+            setTimeout(function() {
+              target.classList.add('in');
+            }, 10);
+          });
+        });
+
+        var closeButtons = document.querySelectorAll('[data-dismiss="modal"], .modal .close');
+
+        closeButtons.forEach(function(button) {
+          button.addEventListener('click', function() {
+            var modal = this.closest('.modal');
+            modal.classList.remove('in');
+            setTimeout(function() {
+              modal.style.display = 'none';
+            }, 150);
+          });
+        });
+
+      });
+
+  /* Skill search input in the left menu */
     function check_skills_sidebar() {
         //Selecting only selected skills
         $("#skill_id option:selected").each(function () {
@@ -10,12 +62,9 @@
                 $.ajax({
                     url: "{{ url }}&a=skill_exists",
                     data: "skill_id=" + skill_id,
-//                async: false,
                     success: function (return_value) {
                         if (return_value == 0) {
                             alert("{{ 'SkillDoesNotExist'|trans }}");
-                            //Deleting select option tag
-                            //$("#skill_id option[value="+skill_id+"]").remove();
                             $("#skill_id").empty();
 
                             //Deleting holder
@@ -56,7 +105,7 @@
                 <td>' + skill_name + '</td>\n\
                 <td class="text-right">\n\
                     <button type="button" id="skill_to_select_id_' + skill_id + '" class="btn btn--warning btn-sm load_wheel" data-id="' + skill_id + '" title="{{ 'PlaceOnTheWheel'|trans }}" aria-label="{{ 'PlaceOnTheWheel'|trans }}">\n\
-                        <span class="fa fa-crosshairs fa-fw" aria-hidden="true"></span>\n\
+                        <span class="mdi mdi-crosshairs mdi-fw" aria-hidden="true"></span>\n\
                     </button>\n\
                 </td>\n\
             </tr>';
@@ -139,7 +188,7 @@
                 }
             },
             cache: false,
-            placeholder: '{{ 'EnterTheSkillNameToSearch'|trans }}'
+            placeholder: '{{ 'Enter the skill name to search'|trans }}'
         }).on('change', function () {
             check_skills_sidebar();
         });
@@ -162,10 +211,10 @@
                 <div class="col-md-3 skill-options">
                     <p class="skill-home">
                         <a class="btn btn-large btn-block btn--primary" href="{{ _p.web }}social">
-                            <em class="fa fa-home"></em> {{ "Return "|trans }}
+                            <em class="mdi mdi-home"></em> {{ "Return "|trans }}
                         </a>
                     </p>
-                    <div class="panel panel-default">
+                    <div class="panel panel-default skill-profile-block">
                         <div class="panel-body">
                             <figure class="text-center">
                                 <img width="100px" src="{{ user_info.avatar }}" class="img-circle center-block">
@@ -173,7 +222,7 @@
                             </figure>
                             <p class="text-center">
                                 <a href="{{ _p.web_main }}social/skills_ranking.php" class="btn btn--plain" target="_blank">
-                                    {{ 'YourSkillRankingX'|trans|format(ranking) }}
+                                    {{ 'Your skill ranking X'|trans|format(ranking) }}
                                 </a>
                             </p>
                             <div class="text-center">
@@ -195,14 +244,14 @@
                         <div class="panel panel-default">
                             <div class="panel-heading">
                                 <a data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
-                                    {{ 'GetNewSkills'|trans }}
+                                    {{ 'Get new skills'|trans }}
                                 </a>
                             </div>
                             <div id="collapseTwo" class="panel-collapse collapse">
                                 <div class="panel-body">
                                     <!-- SEARCH -->
                                     <div class="search-skill">
-                                        <h5 class="page-header">{{ 'SkillsSearch'|trans }}</h5>
+                                        <h5 class="page-header">{{ 'Skills search'|trans }}</h5>
                                         <form id="skill_search" class="form-search">
                                             <select id="skill_id" name="skill_id" multiple style="width: 100%;"></select>
                                             <table id="skill_holder" class="table table-condensed"></table>
@@ -210,12 +259,12 @@
                                     </div>
                                     <!-- END SEARCH -->
                                     <!-- INFO SKILL -->
-                                    <h5 class="page-header">{{ 'SkillInfo'|trans }}</h5>
+                                    <h5 class="page-header">{{ 'Skill information'|trans }}</h5>
                                     <div id="skill_info"></div>
                                     <!-- END INFO SKILL -->
                                     <p>
                                         <a class="btn btn--plain btn-block load_root" rel="0" href="#">
-                                            <em class="fa fa-eye"></em> {{ "ViewSkillsWheel"|trans }}
+                                            <em class="mdi mdi-eye"></em> {{ "View skills wheel"|trans }}
                                         </a>
                                     </p>
                                 </div>
@@ -233,18 +282,18 @@
                             </div>
                             <div id="wheel-legend-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="wheel-legend-heading">
                                 <div class="panel-body">
-                                    <ul class="fa-ul">
+                                    <ul class="mdi-ul">
                                         <li>
-                                            <em class="fa fa-li fa-square skill-legend-basic"></em> {{ "BasicSkills"|trans }}
+                                            <em class="mdi mdi-li mdi-square skill-legend-basic"></em> {{ "Basic skills"|trans }}
                                         </li>
                                         <li>
-                                            <em class="fa fa-li fa-square skill-legend-badges"></em> {{ "SkillsYouAcquired"|trans }}
+                                            <em class="mdi mdi-li mdi-square skill-legend-badges"></em> {{ "Skills you acquired"|trans }}
                                         </li>
                                         <li>
-                                            <em class="fa fa-li fa-square skill-legend-add"></em> {{ "SkillsYouCanLearn"|trans }}
+                                            <em class="mdi mdi-li mdi-square skill-legend-add"></em> {{ "Skills sou can learn"|trans }}
                                         </li>
                                         <li>
-                                            <em class="fa fa-li fa-square skill-legend-search"></em> {{ "SkillsSearchedFor"|trans }}
+                                            <em class="mdi mdi-li mdi-square skill-legend-search"></em> {{ "Skills searched for"|trans }}
                                         </li>
                                     </ul>
                                 </div>
@@ -254,17 +303,17 @@
                             <div class="panel-heading" role="tab" id="wheel-display-heading">
                                 <h4 class="panel-title">
                                     <a class="collapsed" role="button" data-toggle="collapse" data-parent="#wheel-second-accordion" href="#wheel-display-collapse" aria-expanded="false" aria-controls="wheel-display-collapse">
-                                        {{ 'DisplayOptions'|trans }}
+                                        {{ 'Display options'|trans }}
                                     </a>
                                 </h4>
                             </div>
                             <div id="wheel-display-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="wheel-display-heading">
                                 <div class="panel-body">
-                                    <p>{{ 'ChooseABackgroundColor'|trans }}</p>
+                                    <p>{{ 'Choose a background color'|trans }}</p>
                                     <ul class="list-unstyled" id="skill-change-background-options">
                                         <li><a href="#" data-color="#FFFFFF">{{ 'White'|trans }}</a></li>
                                         <li><a href="#" data-color="#000000">{{ 'Black'|trans }}</a></li>
-                                        <li><a href="#" data-color="#A9E2F3">{{ 'LightBlue' }}</a></li>
+                                        <li><a href="#" data-color="#A9E2F3">{{ 'Light blue' }}</a></li>
                                         <li><a href="#" data-color="#848484">{{ 'Gray'|trans }}</a></li>
                                         <li><a href="#" data-color="#F7F8E0">{{ 'Corn'|trans }}</a></li>
                                     </ul>
@@ -311,7 +360,7 @@
                     <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | trans }}">
                         <span aria-hidden="true">&times;</span>
                     </button>
-                    <h4 class="modal-title" id="form-course-info-title">{{ "ChooseCourse" | trans }}</h4>
+                    <h4 class="modal-title" id="form-course-info-title">{{ "Choose course" | trans }}</h4>
                 </div>
                 <div class="modal-body"></div>
                 <div class="modal-footer">