diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index 079028febc..57e8131ad0 100644
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -36,10 +36,9 @@ class CourseDescriptionController
         $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
         $course_description = new CourseDescription();
         $session_id = api_get_session_id();
-        $course_description->set_session_id($session_id);
-
         $data = [];
         $course_description_data = $course_description->get_description_data();
+        $course_description->set_session_id($session_id);
         $data['descriptions'] = isset($course_description_data['descriptions']) ? $course_description_data['descriptions'] : '';
         $data['default_description_titles'] = $course_description->get_default_description_title();
         $data['default_description_title_editable'] = $course_description->get_default_description_title_editable();
diff --git a/main/course_description/listing.php b/main/course_description/listing.php
deleted file mode 100755
index 2463087cbf..0000000000
--- a/main/course_description/listing.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-/**
- * Template (view in MVC pattern) used for listing course descriptions.
- *
- * @author Christian Fasanando <christian1827@gmail.com>
- *
- * @package chamilo.course_description
- */
-
-// protect a course script
-api_protect_course_script(true);
-
-
-// display actions menu
-if (api_is_allowed_to_edit(null, true)) {
-    $categories = [];
-
-    foreach ($default_description_titles as $id => $title) {
-        $categories[$id] = $title;
-    }
-    $categories[ADD_BLOCK] = get_lang('NewBloc');
-
-    $i = 1;
-
-    echo '<div class="actions">';
-    ksort($categories);
-    foreach ($categories as $id => $title) {
-        if ($i == ADD_BLOCK) {
-            echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-                Display::return_icon(
-                    $default_description_icon[$id],
-                    $title,
-                    '',
-                    ICON_SIZE_MEDIUM
-                ).
-                '</a>';
-            break;
-        } else {
-            echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-                Display::return_icon(
-                    $default_description_icon[$id],
-                    $title,
-                    '',
-                    ICON_SIZE_MEDIUM
-                ).
-                '</a>';
-            $i++;
-        }
-    }
-    echo '</div>';
-
-}
-$history = isset($history) ? $history : null;
-
-// display course description list
-if ($history) {
-    echo '<div>
-        <table width="100%">
-            <tr>
-                <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
-                <td align="right"><a href="index.php?action=listing">';
-    echo Display::return_icon(
-        'info.png',
-        get_lang('BackToCourseDesriptionList'),
-        ['style' => 'vertical-align:middle;'],
-        ICON_SIZE_SMALL
-    );
-    echo ' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
-}
-
-$user_info = api_get_user_info();
-
-if (isset($descriptions) && count($descriptions) > 0) {
-    foreach ($descriptions as $id => $description) {
-        if (!empty($description)) {
-            $actions = '';
-            if (api_is_allowed_to_edit(null, true) && !$history) {
-                if (api_get_session_id() == $description['session_id']) {
-                    $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
-
-                    // delete
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
-                    $actions .= Display::return_icon(
-                        'delete.png',
-                        get_lang('Delete'),
-                        ['style' => 'vertical-align:middle;float:right;'],
-                        ICON_SIZE_SMALL
-                    );
-                    $actions .= '</a> ';
-
-                    // edit
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=edit&description_type='.$description['description_type'].'">';
-                    $actions .= Display::return_icon(
-                        'edit.png',
-                        get_lang('Edit'),
-                        ['style' => 'vertical-align:middle;float:right; padding-right:4px;'],
-                        ICON_SIZE_SMALL
-                    );
-                    $actions .= '</a> ';
-                } else {
-                    $actions .= Display::return_icon(
-                        'edit_na.png',
-                        get_lang('EditionNotAvailableFromSession'),
-                        ['style' => 'vertical-align:middle;float:right;'],
-                        ICON_SIZE_SMALL
-                    );
-                }
-            }
-
-            echo Display::panel(
-                Security::remove_XSS($description['content']),
-                "<div class='pull-right'>$actions</div>{$description['title']}",
-                '',
-                'info'
-            );
-        }
-    }
-} else {
-    echo '<em>'.get_lang('ThisCourseDescriptionIsEmpty').'</em>';
-}
-
diff --git a/main/template/default/course_description/index.tpl b/main/template/default/course_description/index.tpl
index 21a7cc502a..82cd199274 100755
--- a/main/template/default/course_description/index.tpl
+++ b/main/template/default/course_description/index.tpl
@@ -1,25 +1,21 @@
 {% for message in messages %}
     {{ message }}
 {% endfor %}
-
 {% for description in listing.descriptions %}
     <div id="description_{{description.description_type}}" class="panel panel-default" data-id="{{description.id}}" data-c_id="{{description.c_id}}" data-type="course_description">
         <div class="panel-heading">
-            {{ dump(description) }}
             {% if is_allowed_to_edit %}
                 <div class="pull-right">
-                    {{ dump(session_id) }}
-
                 {% if session_id == description.session_id %}
-                    <a href="action=delete&amp;id={{description.id}}"
+                    <a href="{{ _p.web_self }}?action=delete&amp;id={{description.id}}&amp;{{_p.web_cid_query}}"
                        onclick="delete_entry('description_{{description.id}}', this); return false;"
                        title="{{'Delete'|get_lang}}">
-                        <em class="size-22 icon-delete"></em>
+                        <img src="{{ 'delete.png'|icon(22) }}" />
                     </a>
 
-                    <a href="action=edit&amp;id={{description.id}}"
+                    <a href="{{ _p.web_self }}?action=edit&amp;id={{description.id}}&amp;{{_p.web_cid_query}}"
                        title="{{'Edit'|get_lang}}">
-                        <em class="size-22 icon-edit"></em>
+                        <img src="{{ 'edit.png'|icon(22) }}" />
                     </a>
                 {% else %}
                     <img title="{{'EditionNotAvailableFromSession'|get_lang}}"
@@ -29,8 +25,6 @@
                 {% endif %}
                 </div>
             {% endif %}
-
-            <img title="{{description.type.title}}" alt="{{description.type.title}}" src="{{description.type.icon|icon(32)}}" class="icon">
             {{description.title}}
         </div>
         <div class="panel-body">