diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index ba0b934c52..2c7c895294 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -4764,6 +4764,10 @@ div#chat-remote-video video {
     padding: 5px;
     border-radius: 5px;
 }
+.grid-courses .items .code-title{
+  font-size: 10px;
+  font-weight: normal;
+}
 .toolbar-edit{
     padding: 5px;
     display: inline-block;
@@ -4889,7 +4893,7 @@ div#chat-remote-video video {
 	padding: 0;
 }
 .grid-courses .items .image {
-    height: 174px;
+    /* min-height: 175px; */
     position: relative;
 }
 .grid-courses .items .image .pin{
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index f0b3351d56..b4a41db408 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -4158,11 +4158,6 @@ class CourseManager
                 }
             }
         }
-
-        if (api_get_setting('display_coursecode_in_courselist') === 'true') {
-            $session_title .= ' ('.$course_info['visual_code'].') ';
-        }
-
         if (api_get_setting('display_teacher_in_courselist') === 'true') {
             $teacher_list = self::getTeachersFromCourse(
                 $course_info['real_id'],
@@ -4181,11 +4176,10 @@ class CourseManager
                 $params['coaches'] = $course_coachs;
             }
         }
-
-        $session_title .= isset($course['special_course']) ? ' '.
-                          Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
-
+        $special = isset($course['special_course']) ? true : false;
         $params['title'] = $session_title;
+        $params['special'] = $special;
+        $params['code'] = $course_info['visual_code'];
         $params['extra'] = '';
         $html = $params;
 
diff --git a/main/template/default/user_portal/grid_session.tpl b/main/template/default/user_portal/grid_session.tpl
index 798d8dd2ea..91645b351b 100644
--- a/main/template/default/user_portal/grid_session.tpl
+++ b/main/template/default/user_portal/grid_session.tpl
@@ -2,56 +2,13 @@
 
 {% macro course_block(course, show_category) %}
     <div class="col-xs-12 col-sm-6 col-md-4">
-        <div class="items">
+        <div class="items items-sessions">
             <div class="image">
                 <img src="{{ course.image }}" class="img-responsive">
                 {% if course.category != '' and show_category %}
                     <span class="category">{{ course.category }}</span>
                     <div class="cribbon"></div>
                 {% endif %}
-                <div class="black-shadow">
-                    <div class="author-card">
-                        {% for teacher in course.teachers %}
-                            {% set counter = counter + 1 %}
-                            {% if counter <= 3 %}
-                                <a href="{{ teacher.url }}" class="ajax"
-                                   data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
-                                    <img src="{{ teacher.avatar }}"/>
-                                </a>
-                                <div class="teachers-details">
-                                    <h5>
-                                        <a href="{{ teacher.url }}" class="ajax"
-                                           data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
-                                            {{ teacher.firstname }} {{ teacher.lastname }}
-                                        </a>
-                                    </h5>
-                                </div>
-                            {% endif %}
-                        {% endfor %}
-                    </div>
-                    {% if item.student_info %}
-                        {% if (item.student_info.progress is not null) and (item.student_info.score is not null) %}
-                            <div class="course-student-info">
-                                <div class="student-info">
-
-                                    {% if (item.student_info.progress is not null) %}
-                                    {{ "StudentCourseProgressX" | get_lang | format(item.student_info.progress) }}
-                                    {% endif %}
-
-                                    {% if (item.student_info.score is not null) %}
-                                    {{ "StudentCourseScoreX" | get_lang | format(item.student_info.score) }}
-                                    {% endif %}
-
-                                    {% if (item.student_info.certificate is not null) %}
-                                    {{ "StudentCourseCertificateX" | get_lang | format(item.student_info.certificate) }}
-                                    {% endif %}
-
-                                </div>
-                            </div>
-                        {% endif %}
-                    {% endif %}
-
-                </div>
                 {% if course.edit_actions != '' %}
                     <div class="admin-actions">
                         {% if course.document == '' %}
@@ -70,14 +27,60 @@
                 {% endif %}
             </div>
             <div class="description">
-                <h4 class="title">
-                    {% if course.visibility == constant('COURSE_VISIBILITY_CLOSED') %}
-                        {{ course.title }} {{ course.code_course }}
-                    {% else %}
-                        <a href="{{ course.link }}">{{ course.title }} {{ course.code_course }}</a>
-                    {% endif %}
-                </h4>
+                <div class="block-title">
+                  <h4 class="title">
+                      {% if course.visibility == constant('COURSE_VISIBILITY_CLOSED') %}
+                          {{ course.title }}
+                          <span class="code-title">{{ course.code }}</span>
+                      {% else %}
+                          <a href="{{ course.link }}">{{ course.title }}</a>
+                      {% endif %}
+                  </h4>
+                </div>
+                <div class="block-author">
+                  {% for teacher in course.teachers %}
+                        {% if course.teachers | length > 2 %}
+                          <a href="{{ teacher.url }}" class="ajax"
+                             data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
+                              <img src="{{ teacher.avatar }}"/>
+                          </a>
+                        {% else %}
+                          <a href="{{ teacher.url }}" class="ajax"
+                             data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
+                              <img src="{{ teacher.avatar }}"/>
+                          </a>
+                          <div class="teachers-details">
+                              <h5>
+                                  <a href="{{ teacher.url }}" class="ajax"
+                                     data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
+                                      {{ teacher.firstname }} {{ teacher.lastname }}
+                                  </a>
+                              </h5>
+                              <p>{{ "Teacher"|get_lang }}</p>
+                          </div>
+                        {% endif %}
+                  {% endfor %}
+                </div>
                 <div class="notifications">{{ course.notifications }}</div>
+                    {% if item.student_info %}
+                        <div class="black-student">
+                        {% if (item.student_info.progress is not null) and (item.student_info.score is not null) %}
+                            <div class="course-student-info">
+                                <div class="student-info">
+                                    {% if (item.student_info.progress is not null) %}
+                                    {{ "StudentCourseProgressX" | get_lang | format(item.student_info.progress) }}
+                                    {% endif %}
+                                    {% if (item.student_info.score is not null) %}
+                                    {{ "StudentCourseScoreX" | get_lang | format(item.student_info.score) }}
+                                    {% endif %}
+                                    {% if (item.student_info.certificate is not null) %}
+                                    {{ "StudentCourseCertificateX" | get_lang | format(item.student_info.certificate) }}
+                                    {% endif %}
+                                </div>
+                            </div>
+                        {% endif %}
+                      </div>
+                  {% endif %}
             </div>
         </div>
     </div>