diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index c9cdf9386b..f76b9e825a 100755
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -139,7 +139,7 @@ if (count($languages) === 1) {
 } else {
     $form->addSelectLanguage(
         'course_language',
-        get_lang('Ln'),
+        get_lang('Language'),
         [],
         ['style' => 'width:150px']
     );
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index e6ccc7e404..78615057e8 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -41,7 +41,6 @@ $allowToEdit = (
 
 $sessionId = api_get_session_id();
 $drhHasAccessToSessionContent = api_drh_can_access_all_session_content();
-
 if (!empty($sessionId) && $drhHasAccessToSessionContent) {
     $allowToEdit = $allowToEdit || api_is_drh();
 }
@@ -66,12 +65,12 @@ $isTutor = false;
 if (!empty($group_id)) {
     $groupProperties = GroupManager:: get_group_properties($group_id);
     $interbreadcrumb[] = [
-        "url" => api_get_path(WEB_CODE_PATH)."group/group.php?".api_get_cidreq(),
-        "name" => get_lang('Groups'),
+        'url' => api_get_path(WEB_CODE_PATH)."group/group.php?".api_get_cidreq(),
+        'name' => get_lang('Groups'),
     ];
     $interbreadcrumb[] = [
-        "url" => api_get_path(WEB_CODE_PATH)."group/group_space.php?".api_get_cidreq(),
-        "name" => get_lang('GroupSpace').' '.$groupProperties['name'],
+        'url' => api_get_path(WEB_CODE_PATH)."group/group_space.php?".api_get_cidreq(),
+        'name' => get_lang('GroupSpace').' '.$groupProperties['name'],
     ];
 
     if ($allowToEdit === false) {
@@ -86,7 +85,7 @@ if (!empty($group_id)) {
 /* Tracking */
 Event::event_access_tool(TOOL_ANNOUNCEMENT);
 
-$announcement_id = isset($_GET['id']) ? intval($_GET['id']) : null;
+$announcement_id = isset($_GET['id']) ? (int) $_GET['id'] : null;
 $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'list';
 $announcement_number = AnnouncementManager::getNumberAnnouncements();
 
@@ -118,8 +117,9 @@ switch ($action) {
 
             $announcementInfo = AnnouncementManager::get_by_id($courseId, $thisAnnouncementId);
             $sql = "SELECT DISTINCT announcement.id, announcement.display_order
-                    FROM $tbl_announcement announcement,
-                    $tbl_item_property itemproperty
+                    FROM $tbl_announcement announcement 
+                    INNER JOIN $tbl_item_property itemproperty
+                    ON (announcement.c_id = itemproperty.c_id)
                     WHERE
                         announcement.c_id = $courseId AND
                         itemproperty.c_id = $courseId AND
@@ -555,7 +555,8 @@ switch ($action) {
                 if (!isset($parts[1]) || empty($parts[1])) {
                     continue;
                 }
-                $form->addHtml("
+                $form->addHtml(
+                    "
                     <script>
                         $(document).on('ready', function () {
                             $('#choose_recipients').click();
diff --git a/main/course_home/activity.php b/main/course_home/activity.php
index b51be242eb..a371e38cbb 100755
--- a/main/course_home/activity.php
+++ b/main/course_home/activity.php
@@ -43,8 +43,6 @@ if ($enabled === 'true') {
 }
 
 //	COURSE ADMIN ONLY VIEW
-$blocks = [];
-// Start of tools for CourseAdmins (teachers/tutors)
 if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
     $content .= '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
 		<div class="normal-message" id="id_normal_message" style="display:none">';
@@ -53,46 +51,7 @@ if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, t
     $content .= '</div>
 		<div class="alert alert-success" id="id_confirmation_message" style="display:none"></div>
 	</div>';
-
     $content .= $pluginExtra;
-
-    if (api_get_setting('show_session_data') == 'true' && $session_id > 0) {
-        $content .= '
-        <div class="row">
-            <div class="col-xs-12 col-md-12">
-                <span class="viewcaption">'.get_lang('SessionData').'</span>
-                <table class="course_activity_home">'.
-                    CourseHome::show_session_data($session_id).'
-                </table>
-            </div>
-        </div>';
-    }
-
-    $my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
-
-    $blocks[] = [
-        'title' => get_lang('Authoring'),
-        'class' => 'course-tools-author',
-        'content' => CourseHome::show_tools_category($my_list),
-    ];
-
-    $list1 = CourseHome::get_tools_category(TOOL_INTERACTION);
-    $list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN);
-    $my_list = array_merge($list1, $list2);
-
-    $blocks[] = [
-        'title' => get_lang('Interaction'),
-        'class' => 'course-tools-interaction',
-        'content' => CourseHome::show_tools_category($my_list),
-    ];
-
-    $my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
-
-    $blocks[] = [
-        'title' => get_lang('Administration'),
-        'class' => 'course-tools-administration',
-        'content' => CourseHome::show_tools_category($my_list),
-    ];
 } elseif (api_is_coach()) {
     $content .= $pluginExtra;
     if (api_get_setting('show_session_data') === 'true' && $session_id > 0) {
@@ -103,76 +62,9 @@ if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, t
         $content .= CourseHome::show_session_data($session_id);
         $content .= '</table></div></div>';
     }
-
-    $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
-
-    $blocks[] = [
-        'content' => CourseHome::show_tools_category($my_list),
-    ];
-
-    $sessionsCopy = api_get_setting('allow_session_course_copy_for_teachers');
-    if ($sessionsCopy === 'true') {
-        // Adding only maintenance for coaches.
-        $myList = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
-        $onlyMaintenanceList = [];
-
-        foreach ($myList as $item) {
-            if ($item['name'] === 'course_maintenance') {
-                $item['link'] = 'course_info/maintenance_coach.php';
-
-                $onlyMaintenanceList[] = $item;
-            }
-        }
-
-        $blocks[] = [
-            'title' => get_lang('Administration'),
-            'content' => CourseHome::show_tools_category($onlyMaintenanceList),
-        ];
-    }
-} else {
-    $tools = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
-    $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
-        api_get_user_id(),
-        api_get_course_info()
-    );
-
-    // Force user icon for DRH
-    if ($isDrhOfCourse) {
-        $addUserTool = true;
-        foreach ($tools as $tool) {
-            if ($tool['name'] === 'user') {
-                $addUserTool = false;
-                break;
-            }
-        }
-
-        if ($addUserTool) {
-            $tools[] = [
-                'c_id' => api_get_course_int_id(),
-                'name' => 'user',
-                'link' => 'user/user.php',
-                'image' => 'members.gif',
-                'visibility' => '1',
-                'admin' => '0',
-                'address' => 'squaregrey.gif',
-                'added_tool' => '0',
-                'target' => '_self',
-                'category' => 'interaction',
-                'session_id' => api_get_session_id(),
-            ];
         }
-    }
-
-    if (count($tools) > 0) {
-        $blocks[] = ['content' => CourseHome::show_tools_category($tools)];
-    }
-
-    if ($isDrhOfCourse) {
-        $drhTool = CourseHome::get_tools_category(TOOL_DRH);
-        $blocks[] = ['content' => CourseHome::show_tools_category($drhTool)];
-    }
-}
 
+$blocks = CourseHome::getUserBlocks();
 $activityView = new Template('', false, false, false, false, false, false);
 $activityView->assign('blocks', $blocks);
 
diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php
index 556867a91b..ef3f17ec97 100755
--- a/main/course_progress/thematic.php
+++ b/main/course_progress/thematic.php
@@ -152,21 +152,21 @@ if ($action == 'thematic_list') {
                         ICON_SIZE_TINY
                     ),
                     'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token,
-                    ['class' => 'btn btn-outline-secondary']
+                    ['class' => 'btn btn-default']
                 );
                 if (api_get_session_id() == 0) {
                     if ($thematic['display_order'] > 1) {
-                        $toolbarThematic .= ' <a class="btn btn-outline-secondary" href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.
+                        $toolbarThematic .= ' <a class="btn btn-default" href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.
                             Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_TINY).'</a>';
                     } else {
-                        $toolbarThematic .= '<div class="btn btn-outline-secondary">'.
+                        $toolbarThematic .= '<div class="btn btn-default">'.
                             Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_TINY).'</div>';
                     }
                     if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
-                        $toolbarThematic .= ' <a class="btn btn-outline-secondary" href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.
+                        $toolbarThematic .= ' <a class="btn btn-default" href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.
                             Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_TINY).'</a>';
                     } else {
-                        $toolbarThematic .= '<div class="btn btn-outline-secondary">'.
+                        $toolbarThematic .= '<div class="btn btn-default">'.
                             Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_TINY).'</div>';
                     }
                 }
@@ -177,7 +177,7 @@ if ($action == 'thematic_list') {
                             'action' => 'export_single_thematic',
                             'thematic_id' => $my_thematic_id,
                         ]),
-                        ['class' => 'btn btn-outline-secondary']
+                        ['class' => 'btn btn-default']
                     );
                     $toolbarThematic .= Display::url(
                         Display::return_icon(
@@ -189,12 +189,12 @@ if ($action == 'thematic_list') {
                         api_get_self().'?'.api_get_cidreq().$url_token.'&'.http_build_query(
                             ['action' => 'export_single_documents', 'thematic_id' => $my_thematic_id]
                         ),
-                        ['class' => 'btn btn-outline-secondary']
+                        ['class' => 'btn btn-default']
                     );
-                    $toolbarThematic .= '<a class="btn btn-outline-secondary" href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='
+                    $toolbarThematic .= '<a class="btn btn-default" href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='
                         .$my_thematic_id.$params.$url_token.'">'
                         .Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_TINY).'</a>';
-                    $toolbarThematic .= '<a class="btn btn-outline-secondary" onclick="javascript:if(!confirm(\''
+                    $toolbarThematic .= '<a class="btn btn-default" onclick="javascript:if(!confirm(\''
                         .get_lang('AreYouSureToDelete')
                         .'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='
                         .$my_thematic_id.$params.$url_token.'">'
diff --git a/main/coursecopy/import_moodle.php b/main/coursecopy/import_moodle.php
index a1eafb1ebd..9abd703eb6 100644
--- a/main/coursecopy/import_moodle.php
+++ b/main/coursecopy/import_moodle.php
@@ -35,21 +35,18 @@ $form->addButtonImport(get_lang('Import'));
 
 if ($form->validate()) {
     $file = $_FILES['moodle_file'];
+
     $moodleImport = new MoodleImport();
-    $responseImport = $moodleImport->import($file);
 
-    Display::cleanFlashMessages();
+    try {
+        $responseImport = $moodleImport->import($file);
 
-    if ($responseImport) {
         Display::addFlash(
-            Display::return_message(
-                get_lang('MoodleFileImportedSuccessfully'),
-                'success'
-            )
+            Display::return_message(get_lang('MoodleFileImportedSuccessfully'), 'success')
         );
-    } else {
+    } catch (Exception $exception) {
         Display::addFlash(
-            Display::return_message(get_lang('ErrorImportingFile'), 'error')
+            Display::return_message($exception->getMessage(), 'error')
         );
     }
 }
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_corriolis.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_corriolis.gif
deleted file mode 100755
index c9ec29a1a7..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_corriolis.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_electrolysis.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_electrolysis.gif
deleted file mode 100755
index df3101780b..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_electrolysis.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_japanese.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_japanese.gif
deleted file mode 100755
index c769042faf..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_japanese.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_loco.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_loco.gif
deleted file mode 100755
index 6503547ece..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_loco.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_pendul.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_pendul.gif
deleted file mode 100755
index 8851e6508f..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_pendul.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_rome.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_rome.gif
deleted file mode 100755
index 171902c5c2..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_rome.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_twostroke.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_twostroke.gif
deleted file mode 100755
index 083ca9648a..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_twostroke.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_wave_frequency.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_wave_frequency.gif
deleted file mode 100755
index eaea95128e..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_wave_frequency.gif and /dev/null differ
diff --git a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_yugoslavia.gif b/main/default_course_document/images/diagrams/animated/.thumbs/.anim_yugoslavia.gif
deleted file mode 100755
index 2364bdf3f3..0000000000
Binary files a/main/default_course_document/images/diagrams/animated/.thumbs/.anim_yugoslavia.gif and /dev/null differ
diff --git a/main/default_course_document/images/logo_dokeos.png b/main/default_course_document/images/logo_dokeos.png
deleted file mode 100755
index b2404dc6b2..0000000000
Binary files a/main/default_course_document/images/logo_dokeos.png and /dev/null differ
diff --git a/main/exercise/TestCategory.php b/main/exercise/TestCategory.php
index 77f1719184..b284808623 100644
--- a/main/exercise/TestCategory.php
+++ b/main/exercise/TestCategory.php
@@ -305,10 +305,8 @@ class TestCategory
      *
      * @return string
      */
-    public static function getCategoryNameForQuestion(
-        $questionId,
-        $courseId = 0
-    ) {
+    public static function getCategoryNameForQuestion($questionId, $courseId = 0)
+    {
         if (empty($courseId)) {
             $courseId = api_get_course_int_id();
         }
@@ -399,9 +397,7 @@ class TestCategory
     public static function getListOfCategoriesNameForTest($exerciseId, $grouped_by_category = true)
     {
         $result = [];
-        $categories = self::getListOfCategoriesIDForTest(
-            $exerciseId
-        );
+        $categories = self::getListOfCategoriesIDForTest($exerciseId);
 
         foreach ($categories as $catInfo) {
             $categoryId = $catInfo['id'];
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
index dd8b42ae74..359443279d 100755
--- a/main/exercise/exercise.class.php
+++ b/main/exercise/exercise.class.php
@@ -7498,9 +7498,9 @@ class Exercise
                 INNER JOIN $TBL_QUESTIONS q
                 ON (e.question_id = q.id AND e.c_id = q.c_id)
                 INNER JOIN $categoryRelTable catRel
-                ON (catRel.question_id = e.question_id)
+                ON (catRel.question_id = e.question_id AND catRel.c_id = e.c_id)
                 INNER JOIN $categoryTable cat
-                ON (cat.id = catRel.category_id)
+                ON (cat.id = catRel.category_id AND cat.c_id = e.c_id)
                 WHERE
                   e.c_id = {$this->course_id} AND
                   e.exercice_id	= ".intval($this->id);
diff --git a/main/exercise/question_pool.php b/main/exercise/question_pool.php
index 7f67e604ba..0286b60c68 100755
--- a/main/exercise/question_pool.php
+++ b/main/exercise/question_pool.php
@@ -432,7 +432,10 @@ if ($exerciseId > 0) {
     $from = '';
     if (isset($courseCategoryId) && $courseCategoryId > 0) {
         $from = ", $TBL_COURSE_REL_CATEGORY crc ";
-        $where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
+        $where .= " AND 
+                crc.c_id = $selected_course AND 
+                crc.question_id = qu.id AND 
+                crc.category_id = $courseCategoryId";
     }
     if (isset($exerciseLevel) && $exerciseLevel != -1) {
         $where .= ' AND level='.$exerciseLevel;
@@ -466,7 +469,8 @@ if ($exerciseId > 0) {
     $level_where = '';
     $from = '';
     if (isset($courseCategoryId) && $courseCategoryId > 0) {
-        $from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
+        $from = " INNER JOIN $TBL_COURSE_REL_CATEGORY crc 
+                  ON crc.question_id = q.id AND crc.c_id = q.c_id ";
         $level_where .= " AND
                 crc.c_id = $selected_course AND
                 crc.category_id = $courseCategoryId";
@@ -490,7 +494,8 @@ if ($exerciseId > 0) {
                 WHERE
                     ex.c_id = '$selected_course' AND
                     ex.active = '-1'
-                    $level_where $answer_where
+                    $level_where 
+                    $answer_where
              )
              UNION
              (
@@ -501,7 +506,8 @@ if ($exerciseId > 0) {
                 WHERE
                     q.c_id = '$selected_course' AND
                     r.question_id is null
-                    $level_where $answer_where
+                    $level_where 
+                    $answer_where
              )
              UNION
              (
@@ -512,7 +518,8 @@ if ($exerciseId > 0) {
                 WHERE
                     r.c_id = '$selected_course' AND
                     (r.exercice_id = '-1' OR r.exercice_id = '0')
-                    $level_where $answer_where
+                    $level_where 
+                    $answer_where
              )";
     $result = Database::query($sql);
     while ($row = Database::fetch_array($result, 'ASSOC')) {
@@ -667,14 +674,14 @@ if ($fromExercise <= 0) {
     // NOT IN A TEST - IN THE COURSE
     if ($selected_course == api_get_course_int_id()) {
         $actionLabel = get_lang('Modify');
-        $actionIcon1 = "edit";
-        $actionIcon2 = "delete";
+        $actionIcon1 = 'edit';
+        $actionIcon2 = 'delete';
         // We are in the course, question title can be a link to the question edit page
         $questionTagA = 1;
     } else { // NOT IN A TEST - NOT IN THE COURSE
         $actionLabel = get_lang('Reuse');
         $actionIcon1 = get_lang('MustBeInATest');
-        $actionIcon2 = "";
+        $actionIcon2 = '';
         // We are not in this course, to messy if we link to the question in another course
         $questionTagA = 0;
     }
@@ -682,51 +689,52 @@ if ($fromExercise <= 0) {
     // IN A TEST - IN THE COURSE
     if ($selected_course == api_get_course_int_id()) {
         $actionLabel = get_lang('Reuse');
-        $actionIcon1 = "add";
-        $actionIcon2 = "";
+        $actionIcon1 = 'add';
+        $actionIcon2 = '';
         $questionTagA = 1;
     } else {
         // IN A TEST - NOT IN THE COURSE
         $actionLabel = get_lang('Reuse');
-        $actionIcon1 = "clone";
-        $actionIcon2 = "";
+        $actionIcon1 = 'clone';
+        $actionIcon2 = '';
         $questionTagA = 0;
     }
 }
+
 // Display table
 $header = [
     [
         get_lang('QuestionUpperCaseFirstLetter'),
         false,
-        ["style" => "text-align:center"],
+        ['style' => 'text-align:center'],
         '',
     ],
     [
         get_lang('Type'),
         false,
-        ["style" => "text-align:center"],
-        ["style" => "text-align:center"],
+        ['style' => 'text-align:center'],
+        ['style' => 'text-align:center'],
         '',
     ],
     [
         get_lang('QuestionCategory'),
         false,
-        ["style" => "text-align:center"],
-        ["style" => "text-align:center"],
+        ['style' => 'text-align:center'],
+        ['style' => 'text-align:center'],
         '',
     ],
     [
         get_lang('Difficulty'),
         false,
-        ["style" => "text-align:center"],
-        ["style" => "text-align:center"],
+        ['style' => 'text-align:center'],
+        ['style' => 'text-align:center'],
         '',
     ],
     [
         $actionLabel,
         false,
-        ["style" => "text-align:center"],
-        ["style" => "text-align:center"],
+        ['style' => 'text-align:center'],
+        ['style' => 'text-align:center'],
         '',
     ],
 ];
@@ -735,20 +743,9 @@ $data = [];
 
 if (is_array($mainQuestionList)) {
     foreach ($mainQuestionList as $question) {
-        /*if ($hideDoubles) {
-            if (in_array($question['question'], $questionAdded)) {
-                continue;
-            }
-        }
-        $questionAdded[$question['question']] = $question;*/
-
         $row = [];
 
-        // This function checks if the question can be read
-        $question_type = get_question_type_for_question(
-            $selected_course,
-            $question['id']
-        );
+        $question_type = get_question_type_for_question($selected_course, $question['id']);
 
         if (empty($question_type)) {
             continue;
@@ -779,7 +776,7 @@ if (is_array($mainQuestionList)) {
             $answerType,
             $session_id,
             $exerciseId
-        )."&nbsp;".
+        ).'&nbsp;'.
         get_action_icon_for_question(
             $actionIcon2,
             $fromExercise,
@@ -900,7 +897,6 @@ function get_action_icon_for_question(
     $in_session_id,
     $in_exercise_id
 ) {
-    $res = "";
     $getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
     switch ($in_action) {
         case 'delete':
@@ -931,7 +927,8 @@ function get_action_icon_for_question(
             unset($myObjEx);
             break;
         case 'clone':
-            $url = api_get_self()."?".api_get_cidreq().$getParams."&question_copy=$in_questionid&course_id=$in_selected_course&fromExercise=$from_exercise";
+            $url = api_get_self()."?".api_get_cidreq().$getParams.
+                "&question_copy=$in_questionid&course_id=$in_selected_course&fromExercise=$from_exercise";
             $res = Display::url(
                 Display::return_icon('cd.png', get_lang('ReUseACopyInCurrentTest')),
                 $url
@@ -968,9 +965,9 @@ function get_question_type_for_question($in_selectedcourse, $in_questionid)
  *
  * @author hubert.borderiou 13-10-2011
  */
-function get_question_categorie_for_question($in_courseid, $in_questionid)
+function get_question_categorie_for_question($courseId, $questionId)
 {
-    $cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
+    $cat = TestCategory::getCategoryNameForQuestion($questionId, $courseId);
 
     return $cat;
 }
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index 6ce74955a5..5507dff804 100755
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -739,6 +739,7 @@ class GradebookTable extends SortableTable
                             $totalRanking,
                             SCORE_DIV,
                             SCORE_BOTH,
+                            true,
                             true
                         );
 
diff --git a/main/group/group_space.php b/main/group/group_space.php
index 26f925c299..812a170a4f 100755
--- a/main/group/group_space.php
+++ b/main/group/group_space.php
@@ -455,11 +455,11 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
 				user.firstname 	AS col2,"
             )."
 				user.email		AS col3
-				FROM $table_user user INNER JOIN 
-				$table_group_user group_rel_user
+				FROM $table_user user 
+				INNER JOIN $table_group_user group_rel_user
 				ON (group_rel_user.user_id = user.id)
 				INNER JOIN $tableGroup g
-				ON (group_rel_user.group_id = g.id)
+				ON (group_rel_user.group_id = g.iid)
 				WHERE 
 				    group_rel_user.c_id = $course_id AND 
 				    g.iid = '".$groupInfo['iid']."'
@@ -480,7 +480,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
                     INNER JOIN $table_group_user gu 
                     ON (gu.user_id = u.id)
                     INNER JOIN $tableGroup g
-				    ON (gu.group_id = g.id)
+				    ON (gu.group_id = g.iid)
                     WHERE 
                         g.iid = '".$groupInfo['iid']."' AND 
                         gu.c_id = $course_id
@@ -501,7 +501,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
                     INNER JOIN $table_group_user group_rel_user
                     ON (group_rel_user.user_id = user.id)
                     INNER JOIN $tableGroup g
-                    ON (group_rel_user.group_id = g.id)
+                    ON (group_rel_user.group_id = g.iid)
                     WHERE 
                         g.iid = '".$groupInfo['iid']."' AND 
                         group_rel_user.c_id = $course_id AND  
diff --git a/main/inc/ajax/agenda.ajax.php b/main/inc/ajax/agenda.ajax.php
index fdd6164037..c4cf32eefa 100755
--- a/main/inc/ajax/agenda.ajax.php
+++ b/main/inc/ajax/agenda.ajax.php
@@ -28,9 +28,9 @@ switch ($action) {
             break;
         }
         $add_as_announcement = isset($_REQUEST['add_as_annonuncement']) ? $_REQUEST['add_as_annonuncement'] : null;
-        $title = isset($_REQUEST['title']) ? Security::remove_XSS($_REQUEST['title']) : null;
-        $content = isset($_REQUEST['content']) ? Security::remove_XSS($_REQUEST['content']) : null;
-        $comment = isset($_REQUEST['comment']) ? Security::remove_XSS($_REQUEST['comment']) : null;
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : null;
+        $content = isset($_REQUEST['content']) ? $_REQUEST['content'] : null;
+        $comment = isset($_REQUEST['comment']) ? $_REQUEST['comment'] : null;
         $userToSend = isset($_REQUEST['users_to_send']) ? $_REQUEST['users_to_send'] : [];
 
         echo $agenda->addEvent(
diff --git a/main/inc/ajax/lp.ajax.php b/main/inc/ajax/lp.ajax.php
index 9725a860f6..32221d341d 100755
--- a/main/inc/ajax/lp.ajax.php
+++ b/main/inc/ajax/lp.ajax.php
@@ -26,20 +26,22 @@ switch ($action) {
         if (empty($folderId)) {
             exit;
         }
-        $lpId = isset($_GET['lp_id']) ? $_GET['lp_id'] : null;
-        $url = isset($_GET['url']) ? $_GET['url'] : null;
+        $lpId = isset($_GET['lp_id']) ? $_GET['lp_id'] : false;
+        $url = isset($_GET['url']) ? $_GET['url'] : '';
+        $addMove = isset($_GET['add_move_button']) && $_GET['add_move_button'] == 1 ? true : false;
 
         echo DocumentManager::get_document_preview(
             $courseInfo,
             $lpId,
             null,
             api_get_session_id(),
-            true,
+            $addMove,
             null,
             $url,
             true,
             false,
-            $folderId
+            $folderId,
+            false
         );
         break;
     case 'add_lp_item':
diff --git a/main/inc/ajax/statistics.ajax.php b/main/inc/ajax/statistics.ajax.php
index b3299167be..eedec70394 100644
--- a/main/inc/ajax/statistics.ajax.php
+++ b/main/inc/ajax/statistics.ajax.php
@@ -8,8 +8,6 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
  */
 require_once __DIR__.'/../global.inc.php';
 
-use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
-
 api_protect_admin_script();
 
 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php
index 0e95e6cf03..96926d920c 100755
--- a/main/inc/lib/AnnouncementManager.php
+++ b/main/inc/lib/AnnouncementManager.php
@@ -1,6 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Entity\ExtraFieldValues;
 use Chamilo\CourseBundle\Entity\CAnnouncement;
 use Chamilo\CourseBundle\Entity\CItemProperty;
 
@@ -1620,8 +1621,11 @@ class AnnouncementManager
             $extraGroupCondition = " AND ip.to_group_id = $group_id ";
         }
 
-        if ((api_is_allowed_to_edit(false, true) || api_is_drh()) &&
-            ($allowUserEditSetting && !api_is_anonymous())
+        $allowDrhAccess = api_get_configuration_value('allow_drh_access_announcement');
+
+        if (api_is_allowed_to_edit(false, true) ||
+            ($allowUserEditSetting && !api_is_anonymous()) ||
+            ($allowDrhAccess && api_is_drh())
         ) {
             // A.1. you are a course admin with a USER filter
             // => see only the messages of this specific user + the messages of the group (s)he is member of.
@@ -1759,8 +1763,8 @@ class AnnouncementManager
                             ip.tool='announcement' 
                             $cond_user_id
                             $condition_session
-                            $searchCondition
-                            AND ip.visibility='1'
+                            $searchCondition AND 
+                            ip.visibility='1'
                         $groupBy
                         ORDER BY display_order DESC";
             } else {
@@ -1768,14 +1772,12 @@ class AnnouncementManager
                     if ($allowUserEditSetting && !api_is_anonymous()) {
                         $cond_user_id = " AND (
                             ip.lastedit_user_id = '".api_get_user_id()."' OR
-                            (
-                                (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND
+                                ((ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND 
                                 (ip.to_group_id='0' OR ip.to_group_id IS NULL)
                             )
                         ) ";
                     } else {
-                        $cond_user_id = " AND (
-                        (ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND 
+                        $cond_user_id = " AND ((ip.to_user_id='$user_id' OR ip.to_user_id IS NULL) AND 
                         (ip.to_group_id='0' OR ip.to_group_id IS NULL) ) ";
                     }
 
@@ -1823,8 +1825,8 @@ class AnnouncementManager
         }
 
         if (!is_null($start) && !is_null($limit)) {
-            $start = intval($start);
-            $limit = intval($limit);
+            $start = (int) $start;
+            $limit = (int) $limit;
             $sql .= " LIMIT $start, $limit";
         }
 
diff --git a/main/inc/lib/MoodleImport.php b/main/inc/lib/MoodleImport.php
index e3d59bdd9d..7bcae5e54c 100644
--- a/main/inc/lib/MoodleImport.php
+++ b/main/inc/lib/MoodleImport.php
@@ -4,8 +4,8 @@
 /**
  * Class MoodleImport.
  *
- * @author José Loguercio <jose.loguercio@beeznest.com>,
- * @author Julio Montoya <gugli100@gmail.com>
+ * @author  José Loguercio <jose.loguercio@beeznest.com>,
+ * @author  Julio Montoya <gugli100@gmail.com>
  *
  * @package chamilo.library
  */
@@ -16,72 +16,312 @@ class MoodleImport
      *
      * @param resource $uploadedFile *.* mbz file moodle course backup
      *
+     * @throws Exception
+     *
      * @return bool
      */
     public function import($uploadedFile)
     {
-        $file = $uploadedFile['tmp_name'];
-
-        if (is_file($file) && is_readable($file)) {
-            $package = new PclZip($file);
-            $mainFileKey = 0;
-            $packageContent = $package->listContent();
-            if (!empty($packageContent)) {
-                foreach ($packageContent as $index => $value) {
-                    if ($value['filename'] == 'moodle_backup.xml') {
-                        $mainFileKey = $index;
-                        break;
+        if (UPLOAD_ERR_OK !== $uploadedFile['error']) {
+            throw new Exception(get_lang('UploadError'));
+        }
+
+        $cachePath = api_get_path(SYS_ARCHIVE_PATH);
+        $tempPath = $uploadedFile['tmp_name'];
+        $nameParts = explode('.', $uploadedFile['name']);
+        $extension = array_pop($nameParts);
+        $name = basename($tempPath).".$extension";
+
+        if (!move_uploaded_file($tempPath, api_get_path(SYS_ARCHIVE_PATH).$name)) {
+            throw new Exception(get_lang('UploadError'));
+        }
+
+        $filePath = $cachePath.$name;
+
+        if (!is_readable($filePath)) {
+            throw new Exception(get_lang('UploadError'));
+        }
+
+        $mimeType = mime_content_type($filePath);
+
+        $folder = api_get_unique_id();
+        $destinationDir = api_get_path(SYS_ARCHIVE_PATH).$folder;
+
+        mkdir($destinationDir, api_get_permissions_for_new_directories(), true);
+
+        switch ($mimeType) {
+            case 'application/x-gzip':
+                $backUpFile = new PharData($filePath);
+
+                if (false === $backUpFile->extractTo($destinationDir)) {
+                    throw new Exception(get_lang('ErrorImportingFile'));
+                }
+
+                if (!file_exists($destinationDir.'/moodle_backup.xml')) {
+                    throw new Exception(get_lang('FailedToImportThisIsNotAMoodleFile'));
+                }
+
+                break;
+            case 'application/zip':
+                $package = new PclZip($filePath);
+                $mainFileKey = 0;
+                $packageContent = $package->listContent();
+
+                if (!empty($packageContent)) {
+                    foreach ($packageContent as $index => $value) {
+                        if ($value['filename'] == 'moodle_backup.xml') {
+                            $mainFileKey = $index;
+                            break;
+                        }
                     }
                 }
-            }
 
-            if (!$mainFileKey) {
-                Display::addFlash(
-                    Display::return_message(
-                        get_lang('FailedToImportThisIsNotAMoodleFile'),
-                        'error'
-                    )
+                if (!$mainFileKey) {
+                    throw new Exception(get_lang('FailedToImportThisIsNotAMoodleFile'));
+                }
+
+                $package->extract(PCLZIP_OPT_PATH, $destinationDir);
+
+                break;
+        }
+
+        $coursePath = api_get_course_path();
+        $sessionId = api_get_session_id();
+        $groupId = api_get_group_id();
+        $documentPath = api_get_path(SYS_COURSE_PATH).$coursePath.'/document';
+        $courseInfo = api_get_course_info();
+
+        create_unexisting_directory(
+            $courseInfo,
+            api_get_user_id(),
+            $sessionId,
+            $groupId,
+            null,
+            $documentPath,
+            '/moodle',
+            'Moodle Docs',
+            0
+        );
+
+        // This process will upload all question resource files
+        $filesXml = @file_get_contents($destinationDir.'/files.xml');
+        $mainFileModuleValues = $this->getAllQuestionFiles($filesXml);
+        $currentResourceFilePath = $destinationDir.'/files/';
+
+        $importedFiles = [];
+
+        foreach ($mainFileModuleValues as $fileInfo) {
+            $dirs = new RecursiveDirectoryIterator($currentResourceFilePath);
+            foreach (new RecursiveIteratorIterator($dirs) as $file) {
+                if (!is_file($file) || false === strpos($file, $fileInfo['contenthash'])) {
+                    continue;
+                }
+
+                $files = [];
+                $files['file']['name'] = $fileInfo['filename'];
+                $files['file']['tmp_name'] = $file->getPathname();
+                $files['file']['type'] = $fileInfo['mimetype'];
+                $files['file']['error'] = 0;
+                $files['file']['size'] = $fileInfo['filesize'];
+                $files['file']['from_file'] = true;
+                $files['file']['move_file'] = true;
+                $_POST['language'] = $courseInfo['language'];
+                $_POST['moodle_import'] = true;
+
+                $data = DocumentManager::upload_document(
+                    $files,
+                    '/moodle',
+                    isset($fileInfo['title']) ? $fileInfo['title'] : pathinfo($fileInfo['filename'], PATHINFO_FILENAME),
+                    '',
+                    null,
+                    null,
+                    true,
+                    true,
+                    'file',
+                    // This is to validate spaces as hyphens
+                    false
                 );
+
+                if ($data) {
+                    $importedFiles[$fileInfo['filename']] = basename($data['path']);
+                }
             }
+        }
+
+        $xml = @file_get_contents($destinationDir.'/moodle_backup.xml');
+
+        $doc = new DOMDocument();
+        $res = @$doc->loadXML($xml);
+
+        if (empty($res)) {
+            removeDir($destinationDir);
+            unlink($filePath);
+
+            throw new Exception(get_lang('FailedToImportThisIsNotAMoodleFile'));
+        }
+        $activities = $doc->getElementsByTagName('activity');
+        foreach ($activities as $activity) {
+            if (empty($activity->childNodes->length)) {
+                continue;
+            }
+
+            $currentItem = [];
+
+            foreach ($activity->childNodes as $item) {
+                $currentItem[$item->nodeName] = $item->nodeValue;
+            }
+
+            $moduleName = isset($currentItem['modulename']) ? $currentItem['modulename'] : false;
+            switch ($moduleName) {
+                case 'forum':
+                    require_once '../forum/forumfunction.inc.php';
+                    $catForumValues = [];
+
+                    // Read the current forum module xml.
+                    $moduleDir = $currentItem['directory'];
+                    $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
+                    $moduleValues = $this->readForumModule($moduleXml);
+
+                    // Create a Forum category based on Moodle forum type.
+                    $catForumValues['forum_category_title'] = $moduleValues['type'];
+                    $catForumValues['forum_category_comment'] = '';
+                    $catId = store_forumcategory(
+                        $catForumValues,
+                        $courseInfo,
+                        false
+                    );
+                    $forumValues = [];
+                    $forumValues['forum_title'] = $moduleValues['name'];
+                    $forumValues['forum_image'] = '';
+                    $forumValues['forum_comment'] = $moduleValues['intro'];
+                    $forumValues['forum_category'] = $catId;
+                    $forumValues['moderated'] = 0;
+
+                    store_forum($forumValues, $courseInfo);
+                    break;
+                case 'quiz':
+                    // Read the current quiz module xml.
+                    // The quiz case is the very complicate process of all the import.
+                    // Please if you want to review the script, try to see the readingXML functions.
+                    // The readingXML functions in this clases do all the mayor work here.
+
+                    $moduleDir = $currentItem['directory'];
+                    $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
+                    $questionsXml = @file_get_contents($destinationDir.'/questions.xml');
+                    $moduleValues = $this->readQuizModule($moduleXml);
+
+                    // At this point we got all the prepared resources from Moodle file
+                    // $moduleValues variable contains all the necesary info to the quiz import
+                    // var_dump($moduleValues); // <-- uncomment this to see the final array
+
+                    $exercise = new Exercise($courseInfo['real_id']);
+                    $title = Exercise::format_title_variable($moduleValues['name']);
+                    $exercise->updateTitle($title);
+                    $exercise->updateDescription($moduleValues['intro']);
+                    $exercise->updateAttempts($moduleValues['attempts_number']);
+                    $exercise->updateFeedbackType(0);
+
+                    // Match shuffle question with chamilo
+                    if (isset($moduleValues['shufflequestions']) &&
+                        (int) $moduleValues['shufflequestions'] === 1
+                    ) {
+                        $exercise->setRandom(-1);
+                    } else {
+                        $exercise->setRandom(0);
+                    }
+                    $exercise->updateRandomAnswers($moduleValues['shuffleanswers']);
+                    // @todo divide to minutes
+                    $exercise->updateExpiredTime($moduleValues['timelimit']);
+
+                    if ($moduleValues['questionsperpage'] == 1) {
+                        $exercise->updateType(2);
+                    } else {
+                        $exercise->updateType(1);
+                    }
+
+                    // Create the new Quiz
+                    $exercise->save();
+
+                    // Ok, we got the Quiz and create it, now its time to add the Questions
+                    foreach ($moduleValues['question_instances'] as $index => $question) {
+                        $questionsValues = $this->readMainQuestionsXml(
+                            $questionsXml,
+                            $question['questionid']
+                        );
+                        $moduleValues['question_instances'][$index] = $questionsValues;
+                        // Set Question Type from Moodle XML element <qtype>
+                        $qType = $moduleValues['question_instances'][$index]['qtype'];
+                        // Add the matched chamilo question type to the array
+                        $moduleValues['question_instances'][$index]['chamilo_qtype'] =
+                            $this->matchMoodleChamiloQuestionTypes($qType);
+                        $questionInstance = Question::getInstance(
+                            $moduleValues['question_instances'][$index]['chamilo_qtype']
+                        );
+
+                        if (empty($questionInstance)) {
+                            continue;
+                        }
+
+                        $questionInstance->updateTitle(
+                            $moduleValues['question_instances'][$index]['name']
+                        );
+                        $questionText = $moduleValues['question_instances'][$index]['questiontext'];
+
+                        // Replace the path from @@PLUGINFILE@@ to a correct chamilo path
+                        $questionText = str_replace(
+                            '@@PLUGINFILE@@',
+                            '/courses/'.$coursePath.'/document/moodle',
+                            $questionText
+                        );
+
+                        if ($importedFiles) {
+                            $this->fixPathInText($importedFiles, $questionText);
+                        }
+
+                        $questionInstance->updateDescription($questionText);
+                        $questionInstance->updateLevel(1);
+                        $questionInstance->updateCategory(0);
+
+                        //Save normal question if NOT media
+                        if ($questionInstance->type != MEDIA_QUESTION) {
+                            $questionInstance->save($exercise);
+
+                            // modify the exercise
+                            $exercise->addToList($questionInstance->id);
+                            $exercise->update_question_positions();
+                        }
+
+                        $questionList = $moduleValues['question_instances'][$index]['plugin_qtype_'.$qType.'_question'];
+                        $currentQuestion = $moduleValues['question_instances'][$index];
+
+                        $this->processAnswers(
+                            $exercise,
+                            $questionList,
+                            $qType,
+                            $questionInstance,
+                            $currentQuestion,
+                            $importedFiles
+                        );
+                    }
+                    break;
+                case 'resource':
+                    // Read the current resource module xml.
+                    $moduleDir = $currentItem['directory'];
+                    $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
+                    $filesXml = @file_get_contents($destinationDir.'/files.xml');
+                    $moduleValues = $this->readResourceModule($moduleXml);
+                    $mainFileModuleValues = $this->readMainFilesXml(
+                        $filesXml,
+                        $moduleValues['contextid']
+                    );
+                    $fileInfo = array_merge($moduleValues, $mainFileModuleValues, $currentItem);
+                    $currentResourceFilePath = $destinationDir.'/files/';
+                    $dirs = new RecursiveDirectoryIterator($currentResourceFilePath);
+                    foreach (new RecursiveIteratorIterator($dirs) as $file) {
+                        if (!is_file($file) || false === strpos($file, $fileInfo['contenthash'])) {
+                            continue;
+                        }
 
-            $folder = api_get_unique_id();
-            $destinationDir = api_get_path(SYS_ARCHIVE_PATH).$folder;
-            $coursePath = api_get_course_path();
-            $sessionId = api_get_session_id();
-            $groupId = api_get_group_id();
-            $documentPath = api_get_path(SYS_COURSE_PATH).$coursePath.'/document';
-            $courseInfo = api_get_course_info();
-
-            mkdir($destinationDir, api_get_permissions_for_new_directories(), true);
-
-            create_unexisting_directory(
-                $courseInfo,
-                api_get_user_id(),
-                $sessionId,
-                $groupId,
-                null,
-                $documentPath,
-                '/moodle',
-                'Moodle Docs',
-                0
-            );
-
-            $package->extract(
-                PCLZIP_OPT_PATH,
-                $destinationDir
-            );
-
-            // This process will upload all question resource files
-            $filesXml = @file_get_contents($destinationDir.'/files.xml');
-            $mainFileModuleValues = $this->getAllQuestionFiles($filesXml);
-            $currentResourceFilePath = $destinationDir.'/files/';
-
-            $importedFiles = [];
-
-            foreach ($mainFileModuleValues as $fileInfo) {
-                $dirs = new RecursiveDirectoryIterator($currentResourceFilePath);
-                foreach (new RecursiveIteratorIterator($dirs) as $file) {
-                    if (is_file($file) && strpos($file, $fileInfo['contenthash']) !== false) {
                         $files = [];
                         $files['file']['name'] = $fileInfo['filename'];
                         $files['file']['tmp_name'] = $file->getPathname();
@@ -93,241 +333,39 @@ class MoodleImport
                         $_POST['language'] = $courseInfo['language'];
                         $_POST['moodle_import'] = true;
 
-                        $data = DocumentManager::upload_document(
+                        DocumentManager::upload_document(
                             $files,
                             '/moodle',
-                            isset($fileInfo['title']) ? $fileInfo['title'] : pathinfo($fileInfo['filename'], PATHINFO_FILENAME),
+                            $fileInfo['title'],
                             '',
                             null,
                             null,
                             true,
-                            true,
-                            'file',
-                            // This is to validate spaces as hyphens
-                            false
+                            true
                         );
-
-                        if ($data) {
-                            $importedFiles[$fileInfo['filename']] = basename($data['path']);
-                        }
                     }
-                }
-            }
-
-            $xml = @file_get_contents($destinationDir.'/moodle_backup.xml');
-
-            $doc = new DOMDocument();
-            $res = @$doc->loadXML($xml);
-            if ($res) {
-                $activities = $doc->getElementsByTagName('activity');
-                foreach ($activities as $activity) {
-                    if ($activity->childNodes->length) {
-                        $currentItem = [];
-
-                        foreach ($activity->childNodes as $item) {
-                            $currentItem[$item->nodeName] = $item->nodeValue;
-                        }
 
-                        $moduleName = isset($currentItem['modulename']) ? $currentItem['modulename'] : false;
-                        switch ($moduleName) {
-                            case 'forum':
-                                require_once '../forum/forumfunction.inc.php';
-                                $catForumValues = [];
-
-                                // Read the current forum module xml.
-                                $moduleDir = $currentItem['directory'];
-                                $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
-                                $moduleValues = $this->readForumModule($moduleXml);
-
-                                // Create a Forum category based on Moodle forum type.
-                                $catForumValues['forum_category_title'] = $moduleValues['type'];
-                                $catForumValues['forum_category_comment'] = '';
-                                $catId = store_forumcategory(
-                                    $catForumValues,
-                                    $courseInfo,
-                                    false
-                                );
-                                $forumValues = [];
-                                $forumValues['forum_title'] = $moduleValues['name'];
-                                $forumValues['forum_image'] = '';
-                                $forumValues['forum_comment'] = $moduleValues['intro'];
-                                $forumValues['forum_category'] = $catId;
-                                $forumValues['moderated'] = 0;
-
-                                store_forum($forumValues, $courseInfo);
-                                break;
-                            case 'quiz':
-                                // Read the current quiz module xml.
-                                // The quiz case is the very complicate process of all the import.
-                                // Please if you want to review the script, try to see the readingXML functions.
-                                // The readingXML functions in this clases do all the mayor work here.
-
-                                $moduleDir = $currentItem['directory'];
-                                $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
-                                $questionsXml = @file_get_contents($destinationDir.'/questions.xml');
-                                $moduleValues = $this->readQuizModule($moduleXml);
-
-                                // At this point we got all the prepared resources from Moodle file
-                                // $moduleValues variable contains all the necesary info to the quiz import
-                                // var_dump($moduleValues); // <-- uncomment this to see the final array
-
-                                $exercise = new Exercise($courseInfo['real_id']);
-                                $title = Exercise::format_title_variable($moduleValues['name']);
-                                $exercise->updateTitle($title);
-                                $exercise->updateDescription($moduleValues['intro']);
-                                $exercise->updateAttempts($moduleValues['attempts_number']);
-                                $exercise->updateFeedbackType(0);
-
-                                // Match shuffle question with chamilo
-                                switch ($moduleValues['shufflequestions']) {
-                                    case '0':
-                                        $exercise->setRandom(0);
-                                        break;
-                                    case '1':
-                                        $exercise->setRandom(-1);
-                                        break;
-                                    default:
-                                        $exercise->setRandom(0);
-                                }
-                                $exercise->updateRandomAnswers($moduleValues['shuffleanswers']);
-                                // @todo divide to minutes
-                                $exercise->updateExpiredTime($moduleValues['timelimit']);
-
-                                if ($moduleValues['questionsperpage'] == 1) {
-                                    $exercise->updateType(2);
-                                } else {
-                                    $exercise->updateType(1);
-                                }
-
-                                // Create the new Quiz
-                                $exercise->save();
-
-                                // Ok, we got the Quiz and create it, now its time to add the Questions
-                                foreach ($moduleValues['question_instances'] as $index => $question) {
-                                    $questionsValues = $this->readMainQuestionsXml(
-                                        $questionsXml,
-                                        $question['questionid']
-                                    );
-                                    $moduleValues['question_instances'][$index] = $questionsValues;
-                                    // Set Question Type from Moodle XML element <qtype>
-                                    $qType = $moduleValues['question_instances'][$index]['qtype'];
-                                    // Add the matched chamilo question type to the array
-                                    $moduleValues['question_instances'][$index]['chamilo_qtype'] = $this->matchMoodleChamiloQuestionTypes($qType);
-                                    $questionInstance = Question::getInstance(
-                                        $moduleValues['question_instances'][$index]['chamilo_qtype']
-                                    );
-                                    if ($questionInstance) {
-                                        $questionInstance->updateTitle(
-                                            $moduleValues['question_instances'][$index]['name']
-                                        );
-                                        $questionText = $moduleValues['question_instances'][$index]['questiontext'];
-
-                                        // Replace the path from @@PLUGINFILE@@ to a correct chamilo path
-                                        $questionText = str_replace(
-                                            '@@PLUGINFILE@@',
-                                            '/courses/'.$coursePath.'/document/moodle',
-                                            $questionText
-                                        );
-
-                                        if ($importedFiles) {
-                                            $this->fixPathInText($importedFiles, $questionText);
-                                        }
-
-                                        $questionInstance->updateDescription($questionText);
-                                        $questionInstance->updateLevel(1);
-                                        $questionInstance->updateCategory(0);
-
-                                        //Save normal question if NOT media
-                                        if ($questionInstance->type != MEDIA_QUESTION) {
-                                            $questionInstance->save($exercise);
-
-                                            // modify the exercise
-                                            $exercise->addToList($questionInstance->id);
-                                            $exercise->update_question_positions();
-                                        }
-
-                                        $questionList = $moduleValues['question_instances'][$index]['plugin_qtype_'.$qType.'_question'];
-                                        $currentQuestion = $moduleValues['question_instances'][$index];
-
-                                        $this->processAnswers(
-                                            $exercise,
-                                            $questionList,
-                                            $qType,
-                                            $questionInstance,
-                                            $currentQuestion,
-                                            $importedFiles
-                                        );
-                                    }
-                                }
-                                break;
-                            case 'resource':
-                                // Read the current resource module xml.
-                                $moduleDir = $currentItem['directory'];
-                                $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
-                                $filesXml = @file_get_contents($destinationDir.'/files.xml');
-                                $moduleValues = $this->readResourceModule($moduleXml);
-                                $mainFileModuleValues = $this->readMainFilesXml(
-                                    $filesXml,
-                                    $moduleValues['contextid']
-                                );
-                                $fileInfo = array_merge($moduleValues, $mainFileModuleValues, $currentItem);
-                                $currentResourceFilePath = $destinationDir.'/files/';
-                                $dirs = new RecursiveDirectoryIterator($currentResourceFilePath);
-                                foreach (new RecursiveIteratorIterator($dirs) as $file) {
-                                    if (is_file($file) && strpos($file, $fileInfo['contenthash']) !== false) {
-                                        $files = [];
-                                        $files['file']['name'] = $fileInfo['filename'];
-                                        $files['file']['tmp_name'] = $file->getPathname();
-                                        $files['file']['type'] = $fileInfo['mimetype'];
-                                        $files['file']['error'] = 0;
-                                        $files['file']['size'] = $fileInfo['filesize'];
-                                        $files['file']['from_file'] = true;
-                                        $files['file']['move_file'] = true;
-                                        $_POST['language'] = $courseInfo['language'];
-                                        $_POST['moodle_import'] = true;
-
-                                        DocumentManager::upload_document(
-                                            $files,
-                                            '/moodle',
-                                            $fileInfo['title'],
-                                            '',
-                                            null,
-                                            null,
-                                            true,
-                                            true
-                                        );
-                                    }
-                                }
-
-                                break;
-                            case 'url':
-                                // Read the current url module xml.
-                                $moduleDir = $currentItem['directory'];
-                                $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
-                                $moduleValues = $this->readUrlModule($moduleXml);
-                                $_POST['title'] = $moduleValues['name'];
-                                $_POST['url'] = $moduleValues['externalurl'];
-                                $_POST['description'] = $moduleValues['intro'];
-                                $_POST['category_id'] = 0;
-                                $_POST['target'] = '_blank';
-
-                                Link::addlinkcategory("link");
-                                break;
-                        }
-                    }
-                }
-            } else {
-                removeDir($destinationDir);
-
-                return false;
+                    break;
+                case 'url':
+                    // Read the current url module xml.
+                    $moduleDir = $currentItem['directory'];
+                    $moduleXml = @file_get_contents($destinationDir.'/'.$moduleDir.'/'.$moduleName.'.xml');
+                    $moduleValues = $this->readUrlModule($moduleXml);
+                    $_POST['title'] = $moduleValues['name'];
+                    $_POST['url'] = $moduleValues['externalurl'];
+                    $_POST['description'] = $moduleValues['intro'];
+                    $_POST['category_id'] = 0;
+                    $_POST['target'] = '_blank';
+
+                    Link::addlinkcategory("link");
+                    break;
             }
-        } else {
-            return false;
         }
 
         removeDir($destinationDir);
+        unlink($filePath);
 
-        return $packageContent[$mainFileKey];
+        return true;
     }
 
     /**
@@ -341,21 +379,20 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($moduleXml);
-        if ($moduleRes) {
-            $activities = $moduleDoc->getElementsByTagName('forum');
-            $currentItem = [];
-            foreach ($activities as $activity) {
-                if ($activity->childNodes->length) {
-                    foreach ($activity->childNodes as $item) {
-                        $currentItem[$item->nodeName] = $item->nodeValue;
-                    }
+        if (empty($moduleRes)) {
+            return false;
+        }
+        $activities = $moduleDoc->getElementsByTagName('forum');
+        $currentItem = [];
+        foreach ($activities as $activity) {
+            if ($activity->childNodes->length) {
+                foreach ($activity->childNodes as $item) {
+                    $currentItem[$item->nodeName] = $item->nodeValue;
                 }
             }
-
-            return $currentItem;
         }
 
-        return false;
+        return $currentItem;
     }
 
     /**
@@ -369,25 +406,24 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($moduleXml);
-        if ($moduleRes) {
-            $activities = $moduleDoc->getElementsByTagName('resource');
-            $mainActivity = $moduleDoc->getElementsByTagName('activity');
-            $contextId = $mainActivity->item(0)->getAttribute('contextid');
-            $currentItem = [];
-            foreach ($activities as $activity) {
-                if ($activity->childNodes->length) {
-                    foreach ($activity->childNodes as $item) {
-                        $currentItem[$item->nodeName] = $item->nodeValue;
-                    }
+        if (empty($moduleRes)) {
+            return false;
+        }
+        $activities = $moduleDoc->getElementsByTagName('resource');
+        $mainActivity = $moduleDoc->getElementsByTagName('activity');
+        $contextId = $mainActivity->item(0)->getAttribute('contextid');
+        $currentItem = [];
+        foreach ($activities as $activity) {
+            if ($activity->childNodes->length) {
+                foreach ($activity->childNodes as $item) {
+                    $currentItem[$item->nodeName] = $item->nodeValue;
                 }
             }
-
-            $currentItem['contextid'] = $contextId;
-
-            return $currentItem;
         }
 
-        return false;
+        $currentItem['contextid'] = $contextId;
+
+        return $currentItem;
     }
 
     /**
@@ -401,21 +437,20 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($moduleXml);
-        if ($moduleRes) {
-            $activities = $moduleDoc->getElementsByTagName('url');
-            $currentItem = [];
-            foreach ($activities as $activity) {
-                if ($activity->childNodes->length) {
-                    foreach ($activity->childNodes as $item) {
-                        $currentItem[$item->nodeName] = $item->nodeValue;
-                    }
+        if (empty($moduleRes)) {
+            return false;
+        }
+        $activities = $moduleDoc->getElementsByTagName('url');
+        $currentItem = [];
+        foreach ($activities as $activity) {
+            if ($activity->childNodes->length) {
+                foreach ($activity->childNodes as $item) {
+                    $currentItem[$item->nodeName] = $item->nodeValue;
                 }
             }
-
-            return $currentItem;
         }
 
-        return false;
+        return $currentItem;
     }
 
     /**
@@ -429,35 +464,34 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($moduleXml);
-        if ($moduleRes) {
-            $activities = $moduleDoc->getElementsByTagName('quiz');
-            $currentItem = [];
-            foreach ($activities as $activity) {
-                if ($activity->childNodes->length) {
-                    foreach ($activity->childNodes as $item) {
-                        $currentItem[$item->nodeName] = $item->nodeValue;
-                    }
+        if (empty($moduleRes)) {
+            return false;
+        }
+        $activities = $moduleDoc->getElementsByTagName('quiz');
+        $currentItem = [];
+        foreach ($activities as $activity) {
+            if ($activity->childNodes->length) {
+                foreach ($activity->childNodes as $item) {
+                    $currentItem[$item->nodeName] = $item->nodeValue;
                 }
             }
+        }
 
-            $questions = $moduleDoc->getElementsByTagName('question_instance');
+        $questions = $moduleDoc->getElementsByTagName('question_instance');
 
-            $questionList = [];
-            $counter = 0;
-            foreach ($questions as $question) {
-                if ($question->childNodes->length) {
-                    foreach ($question->childNodes as $item) {
-                        $questionList[$counter][$item->nodeName] = $item->nodeValue;
-                    }
-                    $counter++;
+        $questionList = [];
+        $counter = 0;
+        foreach ($questions as $question) {
+            if ($question->childNodes->length) {
+                foreach ($question->childNodes as $item) {
+                    $questionList[$counter][$item->nodeName] = $item->nodeValue;
                 }
+                $counter++;
             }
-            $currentItem['question_instances'] = $questionList;
-
-            return $currentItem;
         }
+        $currentItem['question_instances'] = $questionList;
 
-        return false;
+        return $currentItem;
     }
 
     /**
@@ -472,51 +506,54 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($filesXml);
-        if ($moduleRes) {
-            $activities = $moduleDoc->getElementsByTagName('file');
-            $currentItem = [];
-            foreach ($activities as $activity) {
-                if ($activity->childNodes->length) {
-                    $isThisItemThatIWant = false;
-                    foreach ($activity->childNodes as $item) {
-                        if (!$isThisItemThatIWant && $item->nodeName == 'contenthash') {
-                            $currentItem['contenthash'] = $item->nodeValue;
-                        }
-                        if ($item->nodeName == 'contextid' &&
-                            intval($item->nodeValue) == intval($contextId) && !$isThisItemThatIWant
-                        ) {
-                            $isThisItemThatIWant = true;
-                            continue;
-                        }
 
-                        if ($isThisItemThatIWant && $item->nodeName == 'filename') {
-                            $currentItem['filename'] = $item->nodeValue;
-                        }
+        if (empty($moduleRes)) {
+            return false;
+        }
 
-                        if ($isThisItemThatIWant && $item->nodeName == 'filesize') {
-                            $currentItem['filesize'] = $item->nodeValue;
-                        }
+        $activities = $moduleDoc->getElementsByTagName('file');
+        $currentItem = [];
+        foreach ($activities as $activity) {
+            if (empty($activity->childNodes->length)) {
+                continue;
+            }
+            $isThisItemThatIWant = false;
+            foreach ($activity->childNodes as $item) {
+                if (!$isThisItemThatIWant && $item->nodeName == 'contenthash') {
+                    $currentItem['contenthash'] = $item->nodeValue;
+                }
+                if ($item->nodeName == 'contextid' &&
+                    (int) $item->nodeValue == (int) $contextId &&
+                    !$isThisItemThatIWant
+                ) {
+                    $isThisItemThatIWant = true;
+                    continue;
+                }
 
-                        if ($isThisItemThatIWant && $item->nodeName == 'mimetype' &&
-                            $item->nodeValue == 'document/unknown'
-                        ) {
-                            break;
-                        }
+                if ($isThisItemThatIWant && $item->nodeName == 'filename') {
+                    $currentItem['filename'] = $item->nodeValue;
+                }
 
-                        if ($isThisItemThatIWant && $item->nodeName == 'mimetype' &&
-                            $item->nodeValue !== 'document/unknown'
-                        ) {
-                            $currentItem['mimetype'] = $item->nodeValue;
-                            break 2;
-                        }
-                    }
+                if ($isThisItemThatIWant && $item->nodeName == 'filesize') {
+                    $currentItem['filesize'] = $item->nodeValue;
+                }
+
+                if ($isThisItemThatIWant && $item->nodeName == 'mimetype' &&
+                    $item->nodeValue == 'document/unknown'
+                ) {
+                    break;
                 }
-            }
 
-            return $currentItem;
+                if ($isThisItemThatIWant && $item->nodeName == 'mimetype' &&
+                    $item->nodeValue !== 'document/unknown'
+                ) {
+                    $currentItem['mimetype'] = $item->nodeValue;
+                    break 2;
+                }
+            }
         }
 
-        return false;
+        return $currentItem;
     }
 
     /**
@@ -531,56 +568,67 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($questionsXml);
-        if ($moduleRes) {
-            $questions = $moduleDoc->getElementsByTagName('question');
-            $currentItem = [];
-            foreach ($questions as $question) {
-                if (intval($question->getAttribute('id')) == $questionId) {
-                    if ($question->childNodes->length) {
-                        $currentItem['questionid'] = $questionId;
-                        $questionType = '';
-                        foreach ($question->childNodes as $item) {
-                            $currentItem[$item->nodeName] = $item->nodeValue;
-                            if ($item->nodeName == 'qtype') {
-                                $questionType = $item->nodeValue;
-                            }
-
-                            if ($item->nodeName == 'plugin_qtype_'.$questionType.'_question') {
-                                $answer = $item->getElementsByTagName($this->getQuestionTypeAnswersTag($questionType));
-                                $currentItem['plugin_qtype_'.$questionType.'_question'] = [];
-                                for ($i = 0; $i <= $answer->length - 1; $i++) {
-                                    $currentItem['plugin_qtype_'.$questionType.'_question'][$i]['answerid'] = $answer->item($i)->getAttribute('id');
-                                    foreach ($answer->item($i)->childNodes as $properties) {
-                                        $currentItem['plugin_qtype_'.$questionType.'_question'][$i][$properties->nodeName] = $properties->nodeValue;
-                                    }
-                                }
-
-                                $typeValues = $item->getElementsByTagName($this->getQuestionTypeOptionsTag($questionType));
-                                for ($i = 0; $i <= $typeValues->length - 1; $i++) {
-                                    foreach ($typeValues->item($i)->childNodes as $properties) {
-                                        $currentItem[$questionType.'_values'][$properties->nodeName] = $properties->nodeValue;
-                                        if ($properties->nodeName == 'sequence') {
-                                            $sequence = $properties->nodeValue;
-                                            $sequenceIds = explode(',', $sequence);
-                                            foreach ($sequenceIds as $qId) {
-                                                $questionMatch = $this->readMainQuestionsXml($questionsXml, $qId);
-                                                $currentItem['plugin_qtype_'.$questionType.'_question'][] = $questionMatch;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
+        if (empty($moduleRes)) {
+            return false;
+        }
+
+        $questions = $moduleDoc->getElementsByTagName('question');
+        $currentItem = [];
+        foreach ($questions as $question) {
+            if ((int) $question->getAttribute('id') !== (int) $questionId) {
+                continue;
+            }
+
+            if (empty($question->childNodes->length)) {
+                continue;
+            }
+
+            $currentItem['questionid'] = $questionId;
+            $questionType = '';
+            foreach ($question->childNodes as $item) {
+                $currentItem[$item->nodeName] = $item->nodeValue;
+                if ($item->nodeName == 'qtype') {
+                    $questionType = $item->nodeValue;
+                }
+
+                if ($item->nodeName != 'plugin_qtype_'.$questionType.'_question') {
+                    continue;
+                }
+
+                $answer = $item->getElementsByTagName($this->getQuestionTypeAnswersTag($questionType));
+                $currentItem['plugin_qtype_'.$questionType.'_question'] = [];
+                for ($i = 0; $i <= $answer->length - 1; $i++) {
+                    $currentItem['plugin_qtype_'.$questionType.'_question'][$i]['answerid'] =
+                        $answer->item($i)->getAttribute('id');
+                    foreach ($answer->item($i)->childNodes as $properties) {
+                        $currentItem['plugin_qtype_'.$questionType.'_question'][$i][$properties->nodeName] =
+                            $properties->nodeValue;
                     }
                 }
-            }
 
-            $this->traverseArray($currentItem, ['#text', 'question_hints', 'tags']);
+                $typeValues = $item->getElementsByTagName($this->getQuestionTypeOptionsTag($questionType));
+                for ($i = 0; $i <= $typeValues->length - 1; $i++) {
+                    foreach ($typeValues->item($i)->childNodes as $properties) {
+                        $currentItem[$questionType.'_values'][$properties->nodeName] = $properties->nodeValue;
+
+                        if ($properties->nodeName != 'sequence') {
+                            continue;
+                        }
 
-            return $currentItem;
+                        $sequence = $properties->nodeValue;
+                        $sequenceIds = explode(',', $sequence);
+                        foreach ($sequenceIds as $qId) {
+                            $questionMatch = $this->readMainQuestionsXml($questionsXml, $qId);
+                            $currentItem['plugin_qtype_'.$questionType.'_question'][] = $questionMatch;
+                        }
+                    }
+                }
+            }
         }
 
-        return false;
+        $this->traverseArray($currentItem, ['#text', 'question_hints', 'tags']);
+
+        return $currentItem;
     }
 
     /**
@@ -596,10 +644,8 @@ class MoodleImport
             case 'match':
             case 'ddmatch':
                 return 'matchoptions';
-                break;
             default:
                 return $questionType;
-                break;
         }
     }
 
@@ -616,10 +662,8 @@ class MoodleImport
             case 'match':
             case 'ddmatch':
                 return 'match';
-                break;
             default:
                 return 'answer';
-                break;
         }
     }
 
@@ -633,18 +677,14 @@ class MoodleImport
         switch ($moodleQuestionType) {
             case 'multichoice':
                 return UNIQUE_ANSWER;
-                break;
             case 'multianswer':
             case 'shortanswer':
             case 'match':
                 return FILL_IN_BLANKS;
-                break;
             case 'essay':
                 return FREE_ANSWER;
-                break;
             case 'truefalse':
                 return UNIQUE_ANSWER_NO_OPTION;
-                break;
         }
     }
 
@@ -712,7 +752,6 @@ class MoodleImport
                 $questionInstance->save($exercise);
 
                 return true;
-                break;
             case 'multianswer':
                 $objAnswer = new Answer($questionInstance->id);
                 $coursePath = api_get_course_path();
@@ -796,7 +835,6 @@ class MoodleImport
                 $objAnswer->save();
 
                 return true;
-                break;
             case 'shortanswer':
             case 'ddmatch':
                 $questionWeighting = $currentQuestion['defaultmark'];
@@ -805,14 +843,12 @@ class MoodleImport
                 $questionInstance->save($exercise);
 
                 return false;
-                break;
             case 'essay':
                 $questionWeighting = $currentQuestion['defaultmark'];
                 $questionInstance->updateWeighting($questionWeighting);
                 $questionInstance->save($exercise);
 
                 return true;
-                break;
             case 'truefalse':
                 $objAnswer = new Answer($questionInstance->id);
                 $questionWeighting = 0;
@@ -833,10 +869,8 @@ class MoodleImport
                 $questionInstance->save($exercise);
 
                 return false;
-                break;
             default:
                 return false;
-                break;
         }
     }
 
@@ -858,7 +892,7 @@ class MoodleImport
         &$questionWeighting,
         $importedFiles
     ) {
-        $correct = intval($answerValues['fraction']) ? intval($answerValues['fraction']) : 0;
+        $correct = (int) $answerValues['fraction'] ? (int) $answerValues['fraction'] : 0;
         $answer = $answerValues['answertext'];
         $comment = $answerValues['feedback'];
         $weighting = $answerValues['fraction'];
@@ -900,7 +934,7 @@ class MoodleImport
         &$questionWeighting,
         $importedFiles
     ) {
-        $correct = intval($answerValues['fraction']) ? intval($answerValues['fraction']) : 0;
+        $correct = (int) $answerValues['fraction'] ? (int) $answerValues['fraction'] : 0;
         $answer = $answerValues['answertext'];
         $comment = $answerValues['feedback'];
         $weighting = $answerValues['fraction'];
@@ -952,7 +986,7 @@ class MoodleImport
                 $correctAnswer = '';
                 $othersAnswer = '';
                 foreach ($answerValues as $answer) {
-                    $correct = intval($answer['fraction']);
+                    $correct = (int) $answer['fraction'];
                     if ($correct) {
                         $correctAnswer .= $answer['answertext'].'|';
                         $optionsValues['weight'] = $answer['fraction'];
@@ -966,12 +1000,11 @@ class MoodleImport
                 $placeholder = str_replace("{#$position}", $currentAnswers, $placeholder);
 
                 return $optionsValues;
-                break;
             case 'shortanswer':
                 $optionsValues = [];
                 $correctAnswer = '';
                 foreach ($answerValues as $answer) {
-                    $correct = intval($answer['fraction']);
+                    $correct = (int) $answer['fraction'];
                     if ($correct) {
                         $correctAnswer .= $answer['answertext'];
                         $optionsValues['weight'] = $answer['fraction'];
@@ -983,7 +1016,6 @@ class MoodleImport
                 $placeholder = str_replace("{#$position}", $currentAnswers, $placeholder);
 
                 return $optionsValues;
-                break;
             case 'match':
                 $answers = [];
                 // Here first we need to extract all the possible answers
@@ -1019,11 +1051,8 @@ class MoodleImport
                 }
 
                 return $optionsValues;
-
-                break;
             default:
                 return false;
-                break;
         }
     }
 
@@ -1038,45 +1067,48 @@ class MoodleImport
     {
         $moduleDoc = new DOMDocument();
         $moduleRes = @$moduleDoc->loadXML($filesXml);
+
+        if (empty($moduleRes)) {
+            return [];
+        }
+
         $allFiles = [];
-        if ($moduleRes) {
-            $activities = $moduleDoc->getElementsByTagName('file');
-            foreach ($activities as $activity) {
-                $currentItem = [];
-                $thisIsAnInvalidItem = false;
-
-                if ($activity->childNodes->length) {
-                    foreach ($activity->childNodes as $item) {
-                        if ($item->nodeName == 'component' && $item->nodeValue == 'mod_resource') {
-                            $thisIsAnInvalidItem = true;
-                        }
+        $activities = $moduleDoc->getElementsByTagName('file');
+        foreach ($activities as $activity) {
+            $currentItem = [];
+            $thisIsAnInvalidItem = false;
 
-                        if ($item->nodeName == 'contenthash') {
-                            $currentItem['contenthash'] = $item->nodeValue;
-                        }
+            if ($activity->childNodes->length) {
+                foreach ($activity->childNodes as $item) {
+                    if ($item->nodeName == 'component' && $item->nodeValue == 'mod_resource') {
+                        $thisIsAnInvalidItem = true;
+                    }
 
-                        if ($item->nodeName == 'filename') {
-                            $currentItem['filename'] = $item->nodeValue;
-                        }
+                    if ($item->nodeName == 'contenthash') {
+                        $currentItem['contenthash'] = $item->nodeValue;
+                    }
 
-                        if ($item->nodeName == 'filesize') {
-                            $currentItem['filesize'] = $item->nodeValue;
-                        }
+                    if ($item->nodeName == 'filename') {
+                        $currentItem['filename'] = $item->nodeValue;
+                    }
 
-                        if ($item->nodeName == 'mimetype' && $item->nodeValue == 'document/unknown') {
-                            $thisIsAnInvalidItem = true;
-                        }
+                    if ($item->nodeName == 'filesize') {
+                        $currentItem['filesize'] = $item->nodeValue;
+                    }
 
-                        if ($item->nodeName == 'mimetype' && $item->nodeValue !== 'document/unknown') {
-                            $currentItem['mimetype'] = $item->nodeValue;
-                        }
+                    if ($item->nodeName == 'mimetype' && $item->nodeValue == 'document/unknown') {
+                        $thisIsAnInvalidItem = true;
                     }
-                }
 
-                if (!$thisIsAnInvalidItem) {
-                    $allFiles[] = $currentItem;
+                    if ($item->nodeName == 'mimetype' && $item->nodeValue !== 'document/unknown') {
+                        $currentItem['mimetype'] = $item->nodeValue;
+                    }
                 }
             }
+
+            if (!$thisIsAnInvalidItem) {
+                $allFiles[] = $currentItem;
+            }
         }
 
         return $allFiles;
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 667dc91b29..ceb09b3f45 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -21,7 +21,8 @@ class AddCourse
      * @param bool      Add unique prefix
      * @param bool      Use code-independent keys
      *
-     * @return array An array with the needed keys ['currentCourseCode'], ['currentCourseId'], ['currentCourseDbName'], ['currentCourseRepository']
+     * @return array An array with the needed keys ['currentCourseCode'], ['currentCourseId'], ['currentCourseDbName'],
+     *               ['currentCourseRepository']
      *
      * @todo Eliminate the global variables.
      * @assert (null) === false
@@ -401,9 +402,7 @@ class AddCourse
     /**
      * Fills the course database with some required content and example content.
      *
-     * @param int Course (int) ID
-     * @param string Course directory name (e.g. 'ABC')
-     * @param string Language used for content (e.g. 'spanish')
+     * @param array $courseInfo
      * @param bool Whether to fill the course with example content
      * @param int $authorId
      *
@@ -414,18 +413,16 @@ class AddCourse
      * @assert (1, 'ABC', null, null) === false
      * @assert (1, 'TEST', 'spanish', true) === true
      */
-    public static function fill_db_course(
-        $course_id,
-        $course_repository,
-        $language,
+    public static function fillCourse(
+        $courseInfo,
         $fill_with_exemplary_content = null,
         $authorId = 0
     ) {
         if (is_null($fill_with_exemplary_content)) {
             $fill_with_exemplary_content = api_get_setting('example_material_course_creation') !== 'false';
         }
-        $course_id = (int) $course_id;
-        $courseInfo = api_get_course_info_by_id($course_id);
+
+        $course_id = (int) $courseInfo['real_id'];
 
         if (empty($courseInfo)) {
             return false;
@@ -443,10 +440,9 @@ class AddCourse
         $settingsManager->setCourse($course);
 
         $alert = api_get_setting('email_alert_manager_on_new_quiz');
+        $defaultEmailExerciseAlert = 0;
         if ($alert === 'true') {
             $defaultEmailExerciseAlert = 1;
-        } else {
-            $defaultEmailExerciseAlert = 0;
         }
 
         /* course_setting table (courseinfo tool)   */
@@ -479,7 +475,7 @@ class AddCourse
 
         $counter = 1;
         foreach ($settings as $variable => $setting) {
-            $title = isset($setting['title']) ? $setting['title'] : '';
+            $title = $setting['title'] ?? '';
             Database::query(
                 "INSERT INTO $TABLESETTING (id, c_id, title, variable, value, category)
                       VALUES ($counter, $course_id, '".$title."', '".$variable."', '".$setting['default']."', '".$setting['category']."')"
@@ -488,7 +484,6 @@ class AddCourse
         }
 
         /* Course homepage tools for platform admin only */
-
         /* Group tool */
         Database::insert(
             $TABLEGROUPCATEGORIES,
@@ -525,7 +520,7 @@ class AddCourse
             $counter++;
         }
 
-        $sys_course_path = api_get_path(SYS_COURSE_PATH);
+        $certificateId = 'NULL';
 
         /*    Documents   */
         if ($fill_with_exemplary_content) {
@@ -543,140 +538,54 @@ class AddCourse
                 $counter++;
             }
 
-            // FILL THE COURSE DOCUMENT WITH DEFAULT COURSE PICTURES
-            $folders_to_copy_from_default_course = [
-                'images',
-                'audio',
-                'flash',
-                'video',
-                'certificates',
-            ];
-
-            $default_course_path = api_get_path(SYS_CODE_PATH).'default_course_document/';
-
-            $default_document_array = [];
-            foreach ($folders_to_copy_from_default_course as $folder) {
-                $default_course_folder_path = $default_course_path.$folder.'/';
-                $files = self::browse_folders(
-                    $default_course_folder_path,
-                    [],
-                    $folder
-                );
+            $finder = new Symfony\Component\Finder\Finder();
+            $defaultPath = api_get_path(SYS_CODE_PATH).'default_course_document';
+            $finder->in($defaultPath);
+            /** @var SplFileInfo $file */
+            foreach ($finder as $file) {
+                $path = str_replace($defaultPath, '', $file->getRealPath());
+                $parentName = dirname(str_replace($defaultPath, '', $file->getRealPath()));
+                $title = $file->getFilename();
+                if ($file->isDir()) {
+                    create_unexisting_directory(
+                        $courseInfo,
+                        api_get_user_id(),
+                        0,
+                        0,
+                        0,
+                        $path,
+                        $path,
+                        $title
+                    );
+                } else {
+                    $parent = DocumentManager::getDocumentByPathInCourse($courseInfo, $parentName);
+                    $parentId = 0;
+                    if (!empty($parent)) {
+                        $parent = $parent[0];
+                        $parentId = $parent['iid'];
+                    }
 
-                $sorted_array = self::sort_pictures($files, 'dir');
-                $sorted_array = array_merge(
-                    $sorted_array,
-                    self::sort_pictures($files, 'file')
-                );
-                $default_document_array[$folder] = $sorted_array;
-            }
+                    $realPath = str_replace($defaultPath, '', $file->getRealPath());
+                    $document = DocumentManager::addDocument(
+                        $courseInfo,
+                        $realPath,
+                        'file',
+                        $file->getSize(),
+                        $title,
+                        '',
+                        null,
+                        null,
+                        null,
+                        null,
+                        null,
+                        false,
+                        null,
+                        $parentId,
+                        $file->getRealPath()
+                    );
 
-            $example_cert_id = 0;
-            if (is_array($default_document_array) && count(
-                    $default_document_array
-                ) > 0
-            ) {
-                foreach ($default_document_array as $media_type => $array_media) {
-                    $path_documents = "/$media_type/";
-                    /*
-                    //hack until feature #5242 is implemented
-                    if ($media_type == 'images') {
-                        $media_type = 'images/gallery';
-                        $images_folder = $sys_course_path.$course_repository."/document/images/";
-
-                        if (!is_dir($images_folder)) {
-                            //Creating index.html
-                            mkdir($images_folder, $perm);
-                            $fd = fopen($images_folder.'index.html', 'w');
-                            fwrite($fd, $htmlpage);
-                            @chmod($images_folder.'index.html', $perm_file);
-                        }
-                    }*/
-
-                    $course_documents_folder = $sys_course_path.$course_repository."/document/$media_type/";
-                    $default_course_path = api_get_path(SYS_CODE_PATH).'default_course_document'.$path_documents;
-                    /*
-                    if (!is_dir($course_documents_folder)) {
-                        // Creating index.html
-                        mkdir($course_documents_folder, $perm);
-                        $fd = fopen(
-                            $course_documents_folder.'index.html',
-                            'w'
-                        );
-                        fwrite($fd, $htmlpage);
-                        @chmod(
-                            $course_documents_folder.'index.html',
-                            $perm_file
-                        );
-                    }*/
-
-                    if (is_array($array_media) && count($array_media) > 0) {
-                        foreach ($array_media as $key => $value) {
-                            if (isset($value['dir']) && !empty($value['dir'])) {
-                                if (!is_dir($course_documents_folder.$value['dir'])) {
-                                    // Inserting folder in the DB
-                                    $folder_path = substr(
-                                        $value['dir'],
-                                        0,
-                                        strlen($value['dir']) - 1
-                                    );
-                                    $temp = explode('/', $folder_path);
-                                    $title = $temp[count($temp) - 1];
-
-                                    //hack until feature #5242 is implemented
-                                    if ($title == 'gallery') {
-                                        $title = get_lang('DefaultCourseImages');
-                                    }
-
-                                    if ($media_type == 'images/gallery') {
-                                        $folder_path = 'gallery/'.$folder_path;
-                                    }
-
-                                    create_unexisting_directory(
-                                        $courseInfo,
-                                        api_get_user_id(),
-                                        0,
-                                        0,
-                                        0,
-                                        $path_documents.$folder_path,
-                                        $title,
-                                        $title
-                                    );
-                                }
-                            }
-
-                            if (isset($value['file']) && !empty($value['file'])) {
-                                if (!file_exists($default_course_path.$value['file'])) {
-                                    // Copying file
-                                    /*copy(
-                                        $default_course_path.$value['file'],
-                                        $course_documents_folder.$value['file']
-                                    );*/
-                                    $temp = explode('/', $value['file']);
-
-                                    //hack until feature #5242 is implemented
-                                    if ($media_type == 'images/gallery') {
-                                        $value["file"] = 'gallery/'.$value["file"];
-                                    }
-                                    //$default_course_path.$value['file']
-                                    DocumentManager::addDocument(
-                                        $courseInfo,
-                                        $default_course_path.$value['file'],
-                                        'file',
-                                        filesize($default_course_path.$value['file']),
-                                        $temp[count($temp) - 1],
-                                        ''
-                                    );
-
-                                    // Inserting file in the DB
-                                    /*Database::query(
-                                        "INSERT INTO $TABLETOOLDOCUMENT (c_id, path,title,filetype,size)
-                                        VALUES ($course_id,'$path_documents".$value["file"]."','".$temp[count($temp) - 1]."','file','$file_size')"
-                                    );
-                                    $image_id = Database:: insert_id();*/
-                                }
-                            }
-                        }
+                    if ($document && $document->getTitle() === 'default.html') {
+                        $certificateId = $document->getIid();
                     }
                 }
             }
@@ -843,12 +752,12 @@ class AddCourse
             // father gradebook
             Database::query(
                 "INSERT INTO $TABLEGRADEBOOK (name, locked, generate_certificates, description, user_id, c_id, parent_id, weight, visible, certif_min_score, session_id, document_id)
-                VALUES ('$course_code','0',0,'',1,$course_id,0,100,0,75,NULL,$example_cert_id)"
+                VALUES ('$course_code','0',0,'',1,$course_id,0,100,0,75,NULL,$certificateId)"
             );
             $gbid = Database:: insert_id();
             Database::query(
                 "INSERT INTO $TABLEGRADEBOOK (name, locked, generate_certificates, description, user_id, c_id, parent_id, weight, visible, certif_min_score, session_id, document_id)
-                VALUES ('$course_code','0',0,'',1,$course_id,$gbid,100,1,75,NULL,$example_cert_id)"
+                VALUES ('$course_code','0',0,'',1,$course_id,$gbid,100,1,75,NULL,$certificateId)"
             );
             $gbid = Database:: insert_id();
             Database::query(
@@ -1017,33 +926,6 @@ class AddCourse
             $courseManager = Container::$container->get('chamilo_core.entity.manager.course_manager');
             /** @var \Chamilo\CoreBundle\Entity\Course $course */
             $course = $courseManager->create();
-
-            // Here we must add 2 fields.
-            /*$course_id = Database::insert(
-                $TABLECOURSE,
-                [
-                    'code' => $code,
-                    'directory' => $directory,
-                    'course_language' => $course_language,
-                    'title' => $title,
-                    'description' => get_lang('CourseDescription'),
-                    'category_code' => $category_code,
-                    'visibility' => $visibility,
-                    'show_score' => 1,
-                    'disk_quota' => intval($disk_quota),
-                    'creation_date' => $time,
-                    'expiration_date' => $expiration_date,
-                    'last_edit' => $time,
-                    'last_visit' => null,
-                    'tutor_name' => $tutor_name,
-                    'department_name' => $department_name,
-                    'department_url' => $department_url,
-                    'subscribe' => intval($subscribe),
-                    'unsubscribe' => intval($unsubscribe),
-                    'visual_code' => $visual_code,
-                ]
-            );*/
-
             $urlId = 1;
             if (api_get_current_access_url_id() !== -1) {
                 $urlId = api_get_current_access_url_id();
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index 3385e1da99..9a55daa97a 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -2337,10 +2337,9 @@ class Agenda
         $action = isset($params['action']) ? Security::remove_XSS($params['action']) : null;
         $id = isset($params['id']) ? (int) $params['id'] : 0;
 
+        $url = api_get_self().'?action='.$action.'&id='.$id.'&type='.$this->type;
         if ($this->type == 'course') {
             $url = api_get_self().'?'.api_get_cidreq().'&action='.$action.'&id='.$id.'&type='.$this->type;
-        } else {
-            $url = api_get_self().'?action='.$action.'&id='.$id.'&type='.$this->type;
         }
 
         $form = new FormValidator(
diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index 719e9d8143..503f51e492 100755
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -117,9 +117,9 @@ class Attendance
         $course_id = api_get_course_int_id();
         $session_id = api_get_session_id();
         $condition_session = api_get_session_condition($session_id);
-        $column = intval($column);
-        $from = intval($from);
-        $number_of_items = intval($number_of_items);
+        $column = (int) $column;
+        $from = (int) $from;
+        $number_of_items = (int) $number_of_items;
 
         if (!in_array($direction, ['ASC', 'DESC'])) {
             $direction = 'ASC';
@@ -163,6 +163,7 @@ class Attendance
             if (api_get_session_id() == $attendance[6]) {
                 $session_star = api_get_session_image(api_get_session_id(), $user_info['status']);
             }
+
             if ($attendance[5] == 1) {
                 $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
                     api_get_user_id(),
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index a3bf279ee2..5a621c0f9a 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -88,29 +88,29 @@ class CourseManager
     /**
      * Creates a course.
      *
-     * @param array $params   columns in the main.course table
-     * @param int   $authorId
+     * @param array $params      Columns in the main.course table.
+     * @param int   $authorId    Optional.
+     * @param int   $accessUrlId Optional.
      *
      * @return mixed false if the course was not created, array with the course info
      */
-    public static function create_course($params, $authorId = 0)
+    public static function create_course($params, $authorId = 0, $accessUrlId = 0)
     {
         global $_configuration;
 
         $hook = HookCreateCourse::create();
 
         // Check portal limits
-        $access_url_id = 1;
-        if (api_get_multiple_access_url()) {
-            $access_url_id = api_get_current_access_url_id();
-        }
+        $accessUrlId = empty($accessUrlId)
+            ? (api_get_multiple_access_url() ? api_get_current_access_url_id() : 1)
+            : $accessUrlId;
 
         $authorId = empty($authorId) ? api_get_user_id() : (int) $authorId;
 
-        if (isset($_configuration[$access_url_id]) && is_array($_configuration[$access_url_id])) {
+        if (isset($_configuration[$accessUrlId]) && is_array($_configuration[$accessUrlId])) {
             $return = self::checkCreateCourseAccessUrlParam(
                 $_configuration,
-                $access_url_id,
+                $accessUrlId,
                 'hosting_limit_courses',
                 'PortalCoursesLimitReached'
             );
@@ -119,7 +119,7 @@ class CourseManager
             }
             $return = self::checkCreateCourseAccessUrlParam(
                 $_configuration,
-                $access_url_id,
+                $accessUrlId,
                 'hosting_limit_active_courses',
                 'PortalActiveCoursesLimitReached'
             );
@@ -153,7 +153,7 @@ class CourseManager
             $params['directory'] = $keys['currentCourseRepository'];
             $courseInfo = api_get_course_info($params['code']);
             if (empty($courseInfo)) {
-                $courseId = AddCourse::register_course($params);
+                $courseId = AddCourse::register_course($params, $accessUrlId);
                 $courseInfo = api_get_course_info_by_id($courseId);
 
                 if ($hook) {
@@ -6845,10 +6845,8 @@ class CourseManager
         $authorId = empty($authorId) ? api_get_user_id() : (int) $authorId;
 
         AddCourse::prepare_course_repository($courseInfo['directory']);
-        AddCourse::fill_db_course(
-            $courseInfo['real_id'],
-            $courseInfo['directory'],
-            $courseInfo['course_language'],
+        AddCourse::fillCourse(
+            $courseInfo,
             $params['exemplary_content'],
             $authorId
         );
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index 7ded6523cc..0b27cd261e 100755
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -133,9 +133,10 @@ class CourseHome
         }
 
         foreach ($all_tools as &$tool) {
-            if ($tool['image'] == 'scormbuilder.gif') {
+            if (isset($tool['image']) && $tool['image'] == 'scormbuilder.gif') {
                 // check if the published learnpath is visible for student
                 $lpId = self::getPublishedLpIdFromLink($tool['link']);
+
                 if (!api_is_allowed_to_edit(null, true) &&
                     !learnpath::is_lp_visible_for_student(
                         $lpId,
@@ -175,6 +176,7 @@ class CourseHome
 
             // Setting the actual image url
             $tool['img'] = Display::returnIconPath($tool['img']);
+            $target = isset($tool['target']) ? $tool['target'] : '';
 
             // VISIBLE
             if (($tool['visibility'] ||
@@ -190,7 +192,7 @@ class CourseHome
                     $cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_chat'.api_get_course_id().'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                 } else {
                     // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
-                    $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
+                    $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$target.'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                 }
             } else {
                 // INVISIBLE
@@ -341,8 +343,8 @@ class CourseHome
                 $all_tools_list[] = $properties;
             }
         }
+        $lnk = [];
         if (isset($all_tools_list)) {
-            $lnk = [];
             foreach ($all_tools_list as &$tool) {
                 if ($tool['image'] == 'scormbuilder.gif') {
                     // check if the published learnpath is visible for student
@@ -391,7 +393,9 @@ class CourseHome
                 } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
                     $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.htmlspecialchars($tool['link']).$qm_or_amp.api_get_cidreq().'\',\'window_chat'.api_get_course_id().'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'" '.$class.'>';
                 } else {
-                    $html .= '<a href="'.htmlspecialchars($tool['link']).(($tool['image'] == 'external.gif' || $tool['image'] == 'external_na.gif') ? '' : $qm_or_amp.api_get_cidreq()).'" target="'.$tool['target'].'" '.$class.'>';
+                    $target = isset($tool['target']) ? $tool['target'] : '';
+                    $html .= '<a href="'.
+                        htmlspecialchars($tool['link']).(($tool['image'] == 'external.gif' || $tool['image'] == 'external_na.gif') ? '' : $qm_or_amp.api_get_cidreq()).'" target="'.$target.'" '.$class.'>';
                 }
 
                 $tool_name = self::translate_tool_name($tool);
@@ -406,7 +410,7 @@ class CourseHome
 
                 // This part displays the links to hide or remove a tool.
                 // These links are only visible by the course manager.
-                unset($lnk);
+                $lnk = [];
                 if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
                     if ($tool['visibility'] == '1' || $tool['name'] == TOOL_TRACKING) {
                         $link['name'] = Display::returnFontAwesomeIcon('minus');
@@ -759,12 +763,10 @@ class CourseHome
         }
 
         if (isset($tmp_all_tools_list)) {
+            $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
             foreach ($tmp_all_tools_list as $tool) {
                 if ($tool['image'] == 'blog.gif') {
                     // Init
-                    $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-                    // Get blog id
                     $blog_id = substr($tool['link'], strrpos($tool['link'], '=') + 1, strlen($tool['link']));
 
                     // Get blog members
@@ -802,6 +804,7 @@ class CourseHome
     {
         $_user = api_get_user_info();
         $theme = api_get_setting('homepage_view');
+
         if ($theme === 'vertical_activity') {
             //ordering by get_lang name
             $order_tool_list = [];
@@ -824,7 +827,6 @@ class CourseHome
         $session_id = api_get_session_id();
         $is_platform_admin = api_is_platform_admin();
         $allowEditionInSession = api_get_configuration_value('allow_edit_tool_visibility_in_session');
-
         if ($session_id == 0) {
             $is_allowed_to_edit = api_is_allowed_to_edit(null, true) && api_is_course_admin();
         } else {
@@ -834,7 +836,6 @@ class CourseHome
             }
         }
 
-        $i = 0;
         $items = [];
         $app_plugin = new AppPlugin();
 
@@ -984,13 +985,12 @@ class CourseHome
                     $tool['link'] = $web_code_path.$tool['link'];
                 }
 
+                $class = '';
                 if ($tool['visibility'] == '0' && $toolAdmin != '1') {
                     $class = 'text-muted';
                     $info = pathinfo($tool['image']);
                     $basename = basename($tool['image'], '.'.$info['extension']); // $file is set to "index"
                     $tool['image'] = $basename.'_na.'.$info['extension'];
-                } else {
-                    $class = '';
                 }
 
                 $qm_or_amp = strpos($tool['link'], '?') === false ? '?' : '&';
@@ -1051,6 +1051,7 @@ class CourseHome
                         .$tool['original_link'].$qm_or_amp.api_get_cidreq();
                 }
 
+                // Use in the course home
                 $icon = Display::return_icon(
                     $tool['image'],
                     $tool_name,
@@ -1059,6 +1060,24 @@ class CourseHome
                     false
                 );
 
+                // Used in the top bar
+                $iconMedium = Display::return_icon(
+                    $tool['image'],
+                    $tool_name,
+                    ['class' => 'tool-icon', 'id' => 'toolimage_'.$toolIid],
+                    ICON_SIZE_MEDIUM,
+                    false
+                );
+
+                // Used for vertical navigation
+                $iconSmall = Display::return_icon(
+                    $tool['image'],
+                    $tool_name,
+                    ['class' => 'tool-img', 'id' => 'toolimage_'.$toolIid],
+                    ICON_SIZE_SMALL,
+                    false
+                );
+
                 /*if (!empty($tool['custom_icon'])) {
                     $image = self::getCustomWebIconPath().$tool['custom_icon'];
                     $icon = Display::img(
@@ -1081,6 +1100,10 @@ class CourseHome
                 }
                 $item['url_params'] = $tool_link_params;
                 $item['icon'] = Display::url($icon, $tool_link_params['href'], $tool_link_params);
+                $item['only_icon'] = $icon;
+                $item['only_icon_medium'] = $iconMedium;
+                $item['only_icon_small'] = $iconSmall;
+                $item['only_href'] = $tool_link_params['href'];
                 $item['tool'] = $tool;
                 $item['name'] = $tool_name;
                 $tool_link_params['id'] = 'is'.$tool_link_params['id'];
@@ -1090,21 +1113,21 @@ class CourseHome
                     $tool_link_params
                 );
                 $items[] = $item;
-                $i++;
             } // end of foreach
         }
 
-        if (api_get_setting('homepage_view') != 'activity_big') {
-            return $items;
-        }
-
         foreach ($items as &$item) {
-            $originalImage = self::getToolIcon($item);
-            $item['tool']['image'] = Display::url(
-                $originalImage,
-                $item['url_params']['href'],
-                $item['url_params']
-            );
+            $originalImage = self::getToolIcon($item, ICON_SIZE_BIG);
+            $item['tool']['only_icon_medium'] = self::getToolIcon($item, ICON_SIZE_MEDIUM, false);
+            $item['tool']['only_icon_small'] = self::getToolIcon($item, ICON_SIZE_SMALL, false);
+
+            if ($theme === 'activity_big') {
+                $item['tool']['image'] = Display::url(
+                    $originalImage,
+                    $item['url_params']['href'],
+                    $item['url_params']
+                );
+            }
         }
 
         return $items;
@@ -1183,13 +1206,15 @@ class CourseHome
 
         $toolName = Security::remove_XSS(stripslashes($tool['name']));
 
-        if (in_array($tool['image'], $already_translated_icons)) {
+        if (isset($tool['image']) && in_array($tool['image'], $already_translated_icons)) {
             return $toolName;
         }
 
         $toolName = api_underscore_to_camel_case($toolName);
 
-        if (isset($GLOBALS['Tool'.$toolName])) {
+        if (isset($tool['category']) && 'plugin' !== $tool['category'] &&
+            isset($GLOBALS['Tool'.$toolName])
+        ) {
             return get_lang('Tool'.$toolName);
         }
 
@@ -1236,121 +1261,12 @@ class CourseHome
         return $category;
     }
 
-    /**
-     * @param bool $include_admin_tools
-     *
-     * @return array
-     */
-    public static function get_navigation_items($include_admin_tools = false)
-    {
-        $navigation_items = [];
-        $course_id = api_get_course_int_id();
-        $courseInfo = api_get_course_info();
-        $sessionId = api_get_session_id();
-
-        $conditionSession = api_get_session_condition(
-            $sessionId,
-            true,
-            true,
-            'session_id'
-        );
-
-        if (!empty($course_id)) {
-            $course_tools_table = Database::get_course_table(TABLE_TOOL_LIST);
-            /* 	Link to the Course homepage */
-            $navigation_items['home']['image'] = 'home.png';
-            $navigation_items['home']['link'] = $courseInfo['course_public_url'];
-            $navigation_items['home']['name'] = get_lang('CourseHomepageLink');
-
-            $sql = "SELECT * FROM $course_tools_table
-                    WHERE 
-                      c_id = $course_id AND 
-                      visibility = '1' AND 
-                      admin = '0'
-                      $conditionSession
-                    ORDER BY id ASC";
-            $result = Database::query($sql);
-
-            $hideTools = [];
-            $hideToolsKeys = [];
-            if (!api_is_platform_admin()) {
-                $hideTools = api_get_setting('course_hide_tools');
-                $hideToolsKeys = array_keys($hideTools);
-            }
-
-            while ($row = Database::fetch_array($result)) {
-                if (!empty($hideTools)) {
-                    if (in_array($row['name'], $hideToolsKeys)) {
-                        // Tool is hidden
-                        if ($hideTools[$row['name']] == 'true') {
-                            continue;
-                        }
-                    }
-                }
-
-                $navigation_items[$row['id']] = $row;
-                if (stripos($row['link'], 'http://') === false &&
-                    stripos($row['link'], 'https://') === false
-                ) {
-                    $navigation_items[$row['id']]['link'] = api_get_path(WEB_CODE_PATH);
-
-                    if ($row['category'] == 'plugin') {
-                        $plugin = new AppPlugin();
-                        $pluginInfo = $plugin->getPluginInfo($row['name']);
-                        if (isset($pluginInfo['title'])) {
-                            $navigation_items[$row['id']]['link'] = api_get_path(WEB_PLUGIN_PATH);
-                            $navigation_items[$row['id']]['name'] = $pluginInfo['title'];
-                        }
-                    } else {
-                        $navigation_items[$row['id']]['name'] = self::translate_tool_name($row);
-                    }
-
-                    $navigation_items[$row['id']]['link'] .= $row['link'];
-                }
-            }
-
-            /* Admin (edit rights) only links
-            - Course settings (course admin only)
-            - Course rights (roles & rights overview) */
-            if ($include_admin_tools) {
-                $sql = "SELECT name, image FROM $course_tools_table
-                        WHERE c_id = $course_id  AND link='course_info/infocours.php'";
-                $sql_result = Database::query($sql);
-                $course_setting_info = Database::fetch_array($sql_result);
-                $course_setting_visual_name = self::translate_tool_name($course_setting_info);
-                if ($sessionId == 0) {
-                    // course settings item
-                    $navigation_items['course_settings']['image'] = $course_setting_info['image'];
-                    $navigation_items['course_settings']['link'] = api_get_path(WEB_CODE_PATH).'course_info/infocours.php';
-                    $navigation_items['course_settings']['name'] = $course_setting_visual_name;
-                }
-            }
-        }
-
-        foreach ($navigation_items as $key => $navigation_item) {
-            if (strstr($navigation_item['link'], '?')) {
-                //link already contains a parameter, add course id parameter with &
-                $parameter_separator = '&amp;';
-            } else {
-                //link doesn't contain a parameter yet, add course id parameter with ?
-                $parameter_separator = '?';
-            }
-            //$navigation_items[$key]['link'] .= $parameter_separator.api_get_cidreq();
-            $navigation_items[$key]['link'] .= $parameter_separator.'cidReq='.api_get_course_id().'&gidReq=0&id_session='.$sessionId;
-        }
-
-        return $navigation_items;
-    }
-
     /**
      * Show a navigation menu.
      */
     public static function show_navigation_menu()
     {
-        $navigation_items = self::get_navigation_items(true);
-
-        $course_id = api_get_course_id();
-
+        $blocks = self::getUserBlocks();
         $class = null;
         $idLearn = null;
         $item = null;
@@ -1358,62 +1274,37 @@ class CourseHome
 
         $html = '<div id="toolnav">';
         $html .= '<ul id="toolnavbox">';
-        $count = 0;
-        foreach ($navigation_items as $key => $navigation_item) {
             //students can't see the course settings option
-            $count++;
-            if (!api_is_allowed_to_edit() && $key == 'course_settings') {
-                continue;
-            }
-            $html .= '<li>';
-            $url_item = parse_url($navigation_item['link']);
-            $url_current = parse_url($_SERVER['REQUEST_URI']);
+        $showOnlyText = api_get_setting('show_navigation_menu') === 'text';
+        $showOnlyIcons = api_get_setting('show_navigation_menu') === 'icons';
 
-            if (api_get_setting('show_navigation_menu') == 'text') {
+        foreach ($blocks as $block) {
+            $blockItems = $block['content'];
+            foreach ($blockItems as $item) {
+            $html .= '<li>';
+                if ($showOnlyText) {
                 $class = 'text';
                 $marginLeft = 170;
-                $item = $navigation_item['name'];
-            } elseif (api_get_setting('show_navigation_menu') == 'icons') {
-                $class = 'icons';
-                $marginLeft = 25;
-                $item = Display::return_icon(
-                    substr($navigation_item['image'], 0, -3)."png",
-                    $navigation_item['name'],
-                    ['class' => 'tool-img'],
-                    ICON_SIZE_SMALL
-                );
-            } else {
-                $class = 'icons-text';
-                $item = $navigation_item['name'].
-                    Display::return_icon(
-                        substr($navigation_item['image'], 0, -3)."png",
-                        $navigation_item['name'],
-                        ['class' => 'tool-img'],
-                        ICON_SIZE_SMALL
-                    );
-            }
-
-            if (stristr($url_item['path'], $url_current['path'])) {
-                if (!isset($_GET['learnpath_id']) || strpos($url_item['query'], 'learnpath_id='.intval($_GET['learnpath_id'])) === 0) {
-                    $idLearn = ' id="here"';
+                    $show = $item['name'];
+                } elseif ($showOnlyIcons) {
+                    $class = 'icons';
+                    $marginLeft = 25;
+                    $show = $item['tool']['only_icon_small'];
+                } else {
+                    $class = 'icons-text';
+                        $show = $item['name'].$item['tool']['only_icon_small'];
                 }
-            }
-
-            if (strpos($navigation_item['link'], 'chat') !== false &&
-                api_get_course_setting('allow_open_chat_window', $course_id)
-            ) {
-                $html .= '<a '.$idLearn.' class="btn btn-default text-left '.$class.' " href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.api_get_course_id().'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
-                $html .= ' title="'.$navigation_item['name'].'">';
-                $html .= $item;
-                $html .= '</a>';
-            } else {
-                $html .= '<a '.$idLearn.' class="btn btn-default text-left '.$class.'" href="'.$navigation_item['link'].'" target="_top" title="'.$navigation_item['name'].'">';
-                $html .= $item;
-                $html .= '</a>';
-            }
 
+                $item['url_params']['class'] = 'btn btn-default text-left '.$class;
+                $html .= Display::url(
+                    $show,
+                    $item['only_href'],
+                    $item['url_params']
+                );
             $html .= '</li>';
+            }
         }
+
         $html .= '</ul>';
         $html .= '<script>$(function() {
                 $("#toolnavbox a").stop().animate({"margin-left":"-'.$marginLeft.'px"},1000);
@@ -1443,52 +1334,40 @@ class CourseHome
     public static function getCourseToolBar($orientation = SHORTCUTS_HORIZONTAL): string
     {
         $origin = api_get_origin();
+        $courseInfo = api_get_course_info();
         if ($origin === 'learnpath') {
             return '';
         }
 
-        $navigation_items = self::get_navigation_items(false);
+        $blocks = self::getUserBlocks();
+
         $html = '';
-        if (!empty($navigation_items)) {
+        if (!empty($blocks)) {
             $style_id = 'toolshortcuts_vertical';
-            if ($orientation === SHORTCUTS_HORIZONTAL) {
+            if ($orientation == SHORTCUTS_HORIZONTAL) {
                 $style_id = 'toolshortcuts_horizontal';
             }
             $html .= '<div id="'.$style_id.'">';
-            foreach ($navigation_items as $key => $navigation_item) {
-                if (strpos($navigation_item['link'], 'chat') !== false &&
-                    api_get_course_setting('allow_open_chat_window')
-                ) {
-                    $html .= '<a class="items-icon" href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.api_get_course_id().'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
-                } else {
-                    $html .= '<a class="items-icon" href="'.$navigation_item['link'].'"';
-                }
-                if (strpos(api_get_self(), $navigation_item['link']) !== false) {
-                    $html .= ' id="here"';
-                }
-                $html .= ' target="_top" title="'.$navigation_item['name'].'">';
 
-                if (isset($navigation_item['category']) && $navigation_item['category'] == 'plugin') {
-                    /*$plugin_info = $app_plugin->getPluginInfo($navigation_item['name']);
-                    if (isset($plugin_info) && isset($plugin_info['title'])) {
-                        $tool_name = $plugin_info['title'];
-                    }*/
-                    if (!file_exists(api_get_path(SYS_CODE_PATH).'img/'.$navigation_item['image']) &&
-                        !file_exists(api_get_path(SYS_CODE_PATH).'img/icons/'.ICON_SIZE_MEDIUM.'/'.$navigation_item['image'])
-                    ) {
-                        $navigation_item['image'] = 'plugins.png';
-                    }
-                }
+            $html .= Display::url(
+                Display::return_icon('home.png', get_lang('CourseHomepageLink'), '', ICON_SIZE_MEDIUM),
+                $courseInfo['course_public_url'],
+                ['class' => 'items-icon']
+            );
 
-                $html .= Display::return_icon(
-                    substr($navigation_item['image'], 0, -3).'png',
-                    $navigation_item['name'],
-                    [],
-                    ICON_SIZE_MEDIUM
-                );
-                $html .= '</a> ';
-                if ($orientation == SHORTCUTS_VERTICAL) {
-                    $html .= '<br />';
+            foreach ($blocks as $block) {
+                $blockItems = $block['content'];
+                foreach ($blockItems as $item) {
+                    $item['url_params']['id'] = '';
+                    $item['url_params']['class'] = 'items-icon';
+                    $html .= Display::url(
+                        $item['tool']['only_icon_medium'],
+                        $item['only_href'],
+                        $item['url_params']
+                    );
+                    if ($orientation == SHORTCUTS_VERTICAL) {
+                        $html .= '<br />';
+                    }
                 }
             }
             $html .= '</div>';
@@ -1688,6 +1567,145 @@ class CourseHome
         }
     }
 
+    /**
+     * @return array
+     */
+    public static function getCourseAdminBlocks()
+    {
+        $blocks = [];
+        $my_list = self::get_tools_category(TOOL_AUTHORING);
+
+        $blocks[] = [
+            'title' => get_lang('Authoring'),
+            'class' => 'course-tools-author',
+            'content' => self::show_tools_category($my_list),
+        ];
+
+        $list1 = self::get_tools_category(TOOL_INTERACTION);
+        $list2 = self::get_tools_category(TOOL_COURSE_PLUGIN);
+        $my_list = array_merge($list1, $list2);
+
+        $blocks[] = [
+            'title' => get_lang('Interaction'),
+            'class' => 'course-tools-interaction',
+            'content' => self::show_tools_category($my_list),
+        ];
+
+        $my_list = self::get_tools_category(TOOL_ADMIN_PLATFORM);
+
+        $blocks[] = [
+            'title' => get_lang('Administration'),
+            'class' => 'course-tools-administration',
+            'content' => self::show_tools_category($my_list),
+        ];
+
+        return $blocks;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getCoachBlocks()
+    {
+        $blocks = [];
+        $my_list = self::get_tools_category(TOOL_STUDENT_VIEW);
+
+        $blocks[] = [
+            'content' => self::show_tools_category($my_list),
+        ];
+
+        $sessionsCopy = api_get_setting('allow_session_course_copy_for_teachers');
+        if ($sessionsCopy === 'true') {
+            // Adding only maintenance for coaches.
+            $myList = self::get_tools_category(TOOL_ADMIN_PLATFORM);
+            $onlyMaintenanceList = [];
+
+            foreach ($myList as $item) {
+                if ($item['name'] === 'course_maintenance') {
+                    $item['link'] = 'course_info/maintenance_coach.php';
+
+                    $onlyMaintenanceList[] = $item;
+                }
+            }
+
+            $blocks[] = [
+                'title' => get_lang('Administration'),
+                'content' => self::show_tools_category($onlyMaintenanceList),
+            ];
+        }
+
+        return $blocks;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getStudentBlocks()
+    {
+        $blocks = [];
+        $tools = self::get_tools_category(TOOL_STUDENT_VIEW);
+        $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
+            api_get_user_id(),
+            api_get_course_info()
+        );
+
+        // Force user icon for DRH
+        if ($isDrhOfCourse) {
+            $addUserTool = true;
+            foreach ($tools as $tool) {
+                if ($tool['name'] === 'user') {
+                    $addUserTool = false;
+                    break;
+                }
+            }
+
+            if ($addUserTool) {
+                $tools[] = [
+                    'c_id' => api_get_course_int_id(),
+                    'name' => 'user',
+                    'link' => 'user/user.php',
+                    'image' => 'members.gif',
+                    'visibility' => '1',
+                    'admin' => '0',
+                    'address' => 'squaregrey.gif',
+                    'added_tool' => '0',
+                    'target' => '_self',
+                    'category' => 'interaction',
+                    'session_id' => api_get_session_id(),
+                ];
+            }
+        }
+
+        if (count($tools) > 0) {
+            $blocks[] = ['content' => self::show_tools_category($tools)];
+        }
+
+        if ($isDrhOfCourse) {
+            $drhTool = self::get_tools_category(TOOL_DRH);
+            $blocks[] = ['content' => self::show_tools_category($drhTool)];
+        }
+
+        return $blocks;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getUserBlocks()
+    {
+        $sessionId = api_get_session_id();
+        // Start of tools for CourseAdmins (teachers/tutors)
+        if ($sessionId === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
+            $blocks = self::getCourseAdminBlocks();
+        } elseif (api_is_coach()) {
+            $blocks = self::getCoachBlocks();
+        } else {
+            $blocks = self::getStudentBlocks();
+        }
+
+        return $blocks;
+    }
+
     /**
      * Filter tool icons. Only show if $patronKey is = :teacher
      * Example dataIcons[i]['name']: parameter titleIcons1:teacher || titleIcons2 || titleIcons3:teacher.
@@ -1749,10 +1767,12 @@ class CourseHome
      * Find the tool icon when homepage_view is activity_big.
      *
      * @param array $item
+     * @param int   $iconSize
+     * @param bool  $generateId
      *
      * @return string
      */
-    private static function getToolIcon(array $item)
+    private static function getToolIcon(array $item, $iconSize, $generateId = true)
     {
         $image = str_replace('.gif', '.png', $item['tool']['image']);
         $toolIid = isset($item['tool']['iid']) ? $item['tool']['iid'] : null;
@@ -1779,11 +1799,16 @@ class CourseHome
             );
         }
 
+        $id = '';
+        if ($generateId) {
+            $id = 'toolimage_'.$toolIid;
+        }
+
         return Display::return_icon(
-            'tool_'.$image,
+            $image,
             $item['name'],
-            ['id' => 'toolimage_'.$toolIid],
-            ICON_SIZE_BIG,
+            ['id' => $id],
+            $iconSize,
             false
         );
     }
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index 94ff7c883d..3b695ba52c 100644
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -431,7 +431,7 @@ class DocumentManager
      */
     public static function getSessionFolderFilters($path, $sessionId)
     {
-        $sessionId = intval($sessionId);
+        $sessionId = (int) $sessionId;
         $condition = null;
 
         if (!empty($sessionId)) {
@@ -638,7 +638,7 @@ class DocumentManager
      * Gets the paths of all folders in a course
      * can show all folders (except for the deleted ones) or only visible ones.
      *
-     * @param array  $_course
+     * @param array  $courseInfo
      * @param int    $groupIid          iid
      * @param bool   $can_see_invisible
      * @param bool   $getInvisibleList
@@ -647,19 +647,20 @@ class DocumentManager
      * @return array with paths
      */
     public static function get_all_document_folders(
-        $_course,
+        $courseInfo,
         $groupIid = 0,
         $can_see_invisible = false,
         $getInvisibleList = false,
         $path = ''
     ) {
-        $TABLE_ITEMPROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
         $TABLE_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
-        $groupIid = intval($groupIid);
-        $document_folders = [];
+        $groupIid = (int) $groupIid;
+        $courseId = $courseInfo['real_id'];
+        $sessionId = api_get_session_id();
 
+        $folders = [];
         $students = CourseManager::get_user_list_from_course_code(
-            $_course['code'],
+            $courseInfo['code'],
             api_get_session_id()
         );
 
@@ -670,9 +671,9 @@ class DocumentManager
             }
         }
 
-        $groupCondition = " l.to_group_id = $groupIid";
+        $groupCondition = " l.group_id = $groupIid";
         if (empty($groupIid)) {
-            $groupCondition = " (l.group_id = 0 OR l.group_id IS NULL)";
+            $groupCondition = ' (l.group_id = 0 OR l.group_id IS NULL)';
         }
 
         $show_users_condition = '';
@@ -681,50 +682,32 @@ class DocumentManager
         }
 
         if ($can_see_invisible) {
-            // condition for the session
-            $session_id = api_get_session_id();
-            $session_id = $session_id ?: api_get_session_id();
-            $condition_session = " AND (l.session_id = '$session_id' OR (l.session_id = '0' OR l.session_id IS NULL) )";
-            $condition_session .= self::getSessionFolderFilters($path, $session_id);
+            $sessionId = $sessionId ?: api_get_session_id();
+            $condition_session = " AND (l.session_id = '$sessionId' OR (l.session_id = '0' OR l.session_id IS NULL) )";
+            $condition_session .= self::getSessionFolderFilters($path, $sessionId);
+
+            $sql = "SELECT DISTINCT docs.id, docs.path
+                    FROM resource_node AS n
+                    INNER JOIN $TABLE_DOCUMENT  AS docs
+                    ON (docs.resource_node_id = n.id)
+                    INNER JOIN resource_link l
+                    ON (l.resource_node_id = n.id)
+                    WHERE                      
+                        docs.c_id = $courseId AND
+                        docs.filetype = 'folder' AND
+                        $groupCondition AND
+                        docs.path NOT LIKE '%shared_folder%' AND
+                        docs.path NOT LIKE '%_DELETED_%' AND
+                        l.visibility NOT IN ('".ResourceLink::VISIBILITY_DELETED."')                           
+                        $condition_session ";
 
             if ($groupIid != 0) {
-                $sql = "SELECT DISTINCT docs.id, path
-                       FROM $TABLE_ITEMPROPERTY  AS last
-                       INNER JOIN $TABLE_DOCUMENT  AS docs
-                       ON (
-                            docs.id = last.ref AND
-                            docs.c_id = last.c_id
-                       )
-                       WHERE                       
-                            last.tool = '".TOOL_DOCUMENT."' AND
-                            last.c_id = {$_course['real_id']} AND
-                            docs.c_id = {$_course['real_id']} AND
-                            docs.filetype = 'folder' AND
-                            $groupCondition AND
-                            docs.path NOT LIKE '%shared_folder%' AND
-                            docs.path NOT LIKE '%_DELETED_%' AND
-                            last.visibility <> 2                            
-                            $condition_session ";
+                $sql .= " AND docs.path NOT LIKE '%shared_folder%' ";
             } else {
-                $sql = "SELECT DISTINCT docs.id, docs.path
-                        FROM resource_node AS n
-                        INNER JOIN $TABLE_DOCUMENT  AS docs
-                        ON (docs.resource_node_id = n.id)
-                        INNER JOIN resource_link l
-                        ON (l.resource_node_id = n.id)  
-                        WHERE                            
-                            docs.c_id = {$_course['real_id']} AND
-                            docs.filetype = 'folder' AND
-                            docs.path NOT LIKE '%_DELETED_%' AND
-                            $groupCondition AND
-                            l.visibility NOT IN ('".ResourceLink::VISIBILITY_DELETED."')
-                            $show_users_condition 
-                            $condition_session 
-                        ";
+                $sql .= $show_users_condition;
             }
 
             $result = Database::query($sql);
-
             if ($result && Database::num_rows($result) != 0) {
                 while ($row = Database::fetch_array($result, 'ASSOC')) {
                     if (self::is_folder_to_avoid($row['path'])) {
@@ -737,53 +720,49 @@ class DocumentManager
                         }
                     }
 
-                    $document_folders[$row['id']] = $row['path'];
+                    $folders[$row['id']] = $row['path'];
                 }
 
-                if (!empty($document_folders)) {
-                    natsort($document_folders);
+                if (!empty($folders)) {
+                    natsort($folders);
                 }
 
-                return $document_folders;
+                return $folders;
             } else {
                 return false;
             }
         } else {
             // No invisible folders
             // Condition for the session
-            $session_id = api_get_session_id();
             $condition_session = api_get_session_condition(
-                $session_id,
+                $sessionId,
                 true,
                 false,
                 'docs.session_id'
             );
 
-            $visibilityCondition = 'last.visibility = 1';
+            $visibilityCondition = 'l.visibility = 1';
             $fileType = "docs.filetype = 'folder' AND";
             if ($getInvisibleList) {
-                $visibilityCondition = 'last.visibility = 0';
+                $visibilityCondition = 'l.visibility = 0';
                 $fileType = '';
             }
 
             //get visible folders
-            $sql = "SELECT DISTINCT docs.id, path
-                    FROM
-                    $TABLE_ITEMPROPERTY AS last 
-                    INNER JOIN $TABLE_DOCUMENT AS docs
-                    ON (docs.id = last.ref AND last.c_id = docs.c_id)
+            $sql = "SELECT DISTINCT docs.id, docs.path
+                    FROM resource_node AS n
+                    INNER JOIN $TABLE_DOCUMENT  AS docs
+                    ON (docs.resource_node_id = n.id)
+                    INNER JOIN resource_link l
+                    ON (l.resource_node_id = n.id)
                     WHERE
-                        $fileType
-                        last.tool = '".TOOL_DOCUMENT."' AND
+                        $fileType                        
                         $groupCondition AND
                         $visibilityCondition
                         $show_users_condition
-                        $condition_session AND
-                        last.c_id = {$_course['real_id']}  AND
-                        docs.c_id = {$_course['real_id']} ";
-
+                        $condition_session AND                        
+                        docs.c_id = $courseId ";
             $result = Database::query($sql);
-
             $visibleFolders = [];
             while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $visibleFolders[$row['id']] = $row['path'];
@@ -793,34 +772,36 @@ class DocumentManager
                 return $visibleFolders;
             }
 
-            //get invisible folders
-            $sql = "SELECT DISTINCT docs.id, path
-                    FROM $TABLE_ITEMPROPERTY AS last 
-                    INNER JOIN $TABLE_DOCUMENT AS docs
-                    ON (docs.id = last.ref AND last.c_id = docs.c_id)
+            // get invisible folders
+            $sql = "SELECT DISTINCT docs.id, docs.path
+                    FROM resource_node AS n
+                    INNER JOIN $TABLE_DOCUMENT  AS docs
+                    ON (docs.resource_node_id = n.id)
+                    INNER JOIN resource_link l
+                    ON (l.resource_node_id = n.id)
                     WHERE                        
-                        docs.filetype = 'folder' AND
-                        last.tool = '".TOOL_DOCUMENT."' AND
-                        $groupCondition AND
-                        last.visibility = 0 $condition_session AND
-                        last.c_id = {$_course['real_id']} AND
-                        docs.c_id = {$_course['real_id']} ";
+                        docs.filetype = 'folder' AND                        
+                        $groupCondition AND                        
+                        l.visibility IN ('".ResourceLink::VISIBILITY_PENDING."') 
+                        $condition_session AND                        
+                        docs.c_id = $courseId ";
             $result = Database::query($sql);
             $invisibleFolders = [];
             while ($row = Database::fetch_array($result, 'ASSOC')) {
                 //get visible folders in the invisible ones -> they are invisible too
-                $sql = "SELECT DISTINCT docs.id, path
-                        FROM $TABLE_ITEMPROPERTY AS last 
-                        INNER JOIN $TABLE_DOCUMENT AS docs
-                        ON (docs.id = last.ref AND docs.c_id = last.c_id)
+                $sql = "SELECT DISTINCT docs.id, docs.path
+                        FROM resource_node AS n
+                        INNER JOIN $TABLE_DOCUMENT  AS docs
+                        ON (docs.resource_node_id = n.id)
+                        INNER JOIN resource_link l
+                        ON (l.resource_node_id = n.id)
                         WHERE                            
                             docs.path LIKE '".Database::escape_string($row['path'].'/%')."' AND
-                            docs.filetype = 'folder' AND
-                            last.tool = '".TOOL_DOCUMENT."' AND
+                            docs.filetype = 'folder' AND                            
                             $groupCondition AND
-                            last.visibility = 1 $condition_session AND
-                            last.c_id = {$_course['real_id']} AND
-                            docs.c_id = {$_course['real_id']}  ";
+                            l.visibility NOT IN ('".ResourceLink::VISIBILITY_DELETED."') 
+                            $condition_session AND                            
+                            docs.c_id = $courseId ";
                 $folder_in_invisible_result = Database::query($sql);
                 while ($folders_in_invisible_folder = Database::fetch_array($folder_in_invisible_result, 'ASSOC')) {
                     $invisibleFolders[$folders_in_invisible_folder['id']] = $folders_in_invisible_folder['path'];
@@ -829,18 +810,20 @@ class DocumentManager
 
             // If both results are arrays -> //calculate the difference between the 2 arrays -> only visible folders are left :)
             if (is_array($visibleFolders) && is_array($invisibleFolders)) {
-                $document_folders = array_diff($visibleFolders, $invisibleFolders);
-                natsort($document_folders);
+                $folders = array_diff($visibleFolders, $invisibleFolders);
+                natsort($folders);
+
+                return $folders;
+            }
 
-                return $document_folders;
-            } elseif (is_array($visibleFolders)) {
+            if (is_array($visibleFolders)) {
                 natsort($visibleFolders);
 
                 return $visibleFolders;
-            } else {
-                //no visible folders found
-                return false;
             }
+
+            // no visible folders found
+            return false;
         }
     }
 
@@ -851,7 +834,7 @@ class DocumentManager
      * @param array  $_course
      * @param int    $user_id     id of the current user
      * @param string $file        path stored in the database (if not defined, $documentId must be used)
-     * @param int    $document_id in case you dont have the file path ,
+     * @param int    $document_id in case you don't have the file path ,
      *                            insert the id of the file here and leave $file in blank ''
      * @param bool   $to_delete
      * @param int    $sessionId
@@ -867,16 +850,13 @@ class DocumentManager
         $sessionId = null,
         $documentId = null
     ) {
+        $sessionId = (int) $sessionId;
         if (empty($sessionId)) {
             $sessionId = api_get_session_id();
-        } else {
-            $sessionId = intval($sessionId);
         }
-
-        if (empty($document_id) || !is_numeric($document_id)) {
+        $document_id = (int) $document_id;
+        if (empty($document_id)) {
             $document_id = self::get_document_id($_course, $file, $sessionId);
-        } else {
-            $document_id = intval($document_id);
         }
 
         $TABLE_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
@@ -884,7 +864,7 @@ class DocumentManager
         $course_id = $_course['real_id'];
 
         if ($to_delete) {
-            if (self::is_folder($_course, $document_id)) {
+            if (self::isFolder($_course, $document_id)) {
                 if (!empty($file)) {
                     $path = Database::escape_string($file);
                     // Check
@@ -952,7 +932,7 @@ class DocumentManager
      *
      * @return bool true/false
      * */
-    public static function is_folder($_course, $id)
+    public static function isFolder($_course, $id)
     {
         $table = Database::get_course_table(TABLE_DOCUMENT);
         if (empty($_course)) {
@@ -964,7 +944,7 @@ class DocumentManager
                 WHERE c_id = $course_id AND id= $id";
         $result = Database::fetch_array(Database::query($sql), 'ASSOC');
 
-        return $result['filetype'] == 'folder';
+        return $result['filetype'] === 'folder';
     }
 
     /**
@@ -4380,7 +4360,7 @@ class DocumentManager
     }
 
     /**
-     * Check if the past is used in this course.
+     * Check if the path is used in this course.
      *
      * @param array  $courseInfo
      * @param string $path
@@ -4648,7 +4628,7 @@ class DocumentManager
             return false;
         }
 
-        $sessionId = intval($sessionId);
+        $sessionId = (int) $sessionId;
         $folderWithSuffix = self::fixDocumentName(
             $folder,
             'folder',
@@ -4667,7 +4647,7 @@ class DocumentManager
                     filetype = 'folder' AND
                     c_id = $courseId AND
                     (path = '$folder' OR path = '$folderWithSuffix') AND
-                    (session_id = 0 OR session_id = $sessionId)
+                    (session_id = 0 OR session_id IS NULL OR session_id = $sessionId)
         ";
 
         $rs = Database::query($sql);
@@ -6418,13 +6398,14 @@ class DocumentManager
      * @param string $title
      * @param string $comment
      * @param int    $readonly
-     * @param int    $visibility       see ResourceLink constants
-     * @param int    $group_id         group.id
-     * @param int    $sessionId        Session ID, if any
-     * @param int    $userId           creator user id
+     * @param int    $visibility see ResourceLink constants
+     * @param int    $groupId    group.id
+     * @param int    $sessionId  Session ID, if any
+     * @param int    $userId     creator user id
      * @param bool   $sendNotification
      * @param string $content
      * @param int    $parentId
+     * @param string $realPath
      *
      * @return CDocument|false
      */
@@ -6437,15 +6418,15 @@ class DocumentManager
         $comment = null,
         $readonly = 0,
         $visibility = null,
-        $group_id = 0,
+        $groupId = 0,
         $sessionId = 0,
         $userId = 0,
         $sendNotification = true,
         $content = '',
-        $parentId = 0
+        $parentId = 0,
+        $realPath = ''
     ) {
         $userId = empty($userId) ? api_get_user_id() : $userId;
-
         if (empty($userId)) {
             return false;
         }
@@ -6456,19 +6437,18 @@ class DocumentManager
         }
 
         $courseEntity = api_get_course_entity($courseInfo['real_id']);
-
         if (empty($courseEntity)) {
             return false;
         }
 
         $sessionId = empty($sessionId) ? api_get_session_id() : $sessionId;
         $session = api_get_session_entity($sessionId);
-        $group = api_get_group_entity($group_id);
+        $group = api_get_group_entity($groupId);
         $readonly = (int) $readonly;
 
         $em = Database::getManager();
+
         $documentRepo = Container::$container->get('Chamilo\CourseBundle\Repository\CDocumentRepository');
-        //$documentRepo = $em->getRepository('ChamiloCourseBundle:CDocument');
 
         $parentNode = null;
         if (!empty($parentId)) {
@@ -6508,9 +6488,10 @@ class DocumentManager
             $extension = pathinfo($fileName, PATHINFO_EXTENSION);
             $media->setContext('default');
 
-            $provider = 'sonata.media.provider.image';
-            if (!in_array($extension, ['jpeg', 'jpg', 'gif', 'png'])) {
-                $provider = 'sonata.media.provider.file';
+            $provider = 'sonata.media.provider.file';
+            $isImage = in_array($extension, ['jpeg', 'jpg', 'gif', 'png']);
+            if ($isImage) {
+                $provider = 'sonata.media.provider.image';
             }
 
             $media->setProviderName($provider);
@@ -6520,10 +6501,22 @@ class DocumentManager
                 $file = $content;
                 $media->setSize($file->getSize());
             } else {
-                $handle = tmpfile();
-                fwrite($handle, $content);
-                $file = new \Sonata\MediaBundle\Extra\ApiMediaFile($handle);
-                $file->setMimetype($media->getContentType());
+                // $path points to a file in the directory
+                if (file_exists($realPath) && !is_dir($realPath)) {
+                    $media->setSize(filesize($realPath));
+                    if ($isImage) {
+                        $size = getimagesize($realPath);
+                        $media->setWidth($size[0]);
+                        $media->setHeight($size[1]);
+                    }
+                    $file = $realPath;
+                } else {
+                    // We get the content and create a file
+                    $handle = tmpfile();
+                    fwrite($handle, $content);
+                    $file = new \Sonata\MediaBundle\Extra\ApiMediaFile($handle);
+                    $file->setMimetype($media->getContentType());
+                }
             }
 
             $media->setBinaryContent($file);
@@ -6591,7 +6584,7 @@ class DocumentManager
                 api_set_default_visibility(
                     $documentId,
                     TOOL_DOCUMENT,
-                    $group_id,
+                    $groupId,
                     $courseInfo,
                     $sessionId,
                     $userId
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index 480fe04be6..b12dd8724b 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -3205,7 +3205,7 @@ EOT;
             // only end is set
             $time_conditions .= " (start_time IS NULL AND end_time <> '' AND end_time > '$now') OR ";
             // nothing is set
-            $time_conditions .= " (start_time IS NULL AND end_time IS NULL))  ";
+            $time_conditions .= ' (start_time IS NULL AND end_time IS NULL)) ';
         }
 
         $needle_where = !empty($search) ? " AND title LIKE '?' " : '';
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 87c680b9e6..abaee0d721 100755
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -1563,7 +1563,7 @@ function create_unexisting_directory(
         $title = basename($desired_dir_name);
     }
 
-    if (!is_dir($base_work_dir.$systemFolderName)) {
+    //if (!is_dir($base_work_dir.$systemFolderName)) {
         /*$result = mkdir(
             $base_work_dir.$systemFolderName,
             api_get_permissions_for_new_directories(),
@@ -1580,12 +1580,6 @@ function create_unexisting_directory(
                             path = '".Database::escape_string($systemFolderName)."'
                         )
             ";
-
-            $groupInfo = [];
-            if (!empty($to_group_id)) {
-                $groupInfo = GroupManager::get_group_properties($to_group_id);
-            }
-
             $rs = Database::query($sql);
             if (Database::num_rows($rs) == 0) {
                 $document = DocumentManager::addDocument(
@@ -1655,7 +1649,7 @@ function create_unexisting_directory(
                 return $document;
             }
         }
-    }
+    //}
 
     return false;
 }
diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index e267602e62..cad85f797c 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -1290,92 +1290,6 @@ EOT;
         return $this->returnForm();
     }
 
-    /**
-     * Create a form validator based on an array of form data:.
-     *
-     *         array(
-     *             'name' => 'zombie_report_parameters',    //optional
-     *             'method' => 'GET',                       //optional
-     *             'items' => array(
-     *                 array(
-     *                     'name' => 'ceiling',
-     *                     'label' => 'Ceiling',            //optional
-     *                     'type' => 'date',
-     *                     'default' => date()              //optional
-     *                 ),
-     *                 array(
-     *                     'name' => 'active_only',
-     *                     'label' => 'ActiveOnly',
-     *                     'type' => 'checkbox',
-     *                     'default' => true
-     *                 ),
-     *                 array(
-     *                     'name' => 'submit_button',
-     *                     'type' => 'style_submit_button',
-     *                     'value' => get_lang('Search'),
-     *                     'attributes' => array('class' => 'search')
-     *                 )
-     *             )
-     *         );
-     *
-     * @param array $form_data
-     *
-     * @deprecated use normal FormValidator construct
-     *
-     * @return FormValidator
-     */
-    public static function create($form_data)
-    {
-        if (empty($form_data)) {
-            return null;
-        }
-        $form_name = isset($form_data['name']) ? $form_data['name'] : 'form';
-        $form_method = isset($form_data['method']) ? $form_data['method'] : 'POST';
-        $form_action = isset($form_data['action']) ? $form_data['action'] : '';
-        $form_target = isset($form_data['target']) ? $form_data['target'] : '';
-        $form_attributes = isset($form_data['attributes']) ? $form_data['attributes'] : null;
-        $form_track_submit = isset($form_data['track_submit']) ? $form_data['track_submit'] : true;
-        $reset = null;
-        $result = new FormValidator($form_name, $form_method, $form_action, $form_target, $form_attributes, $form_track_submit);
-
-        $defaults = [];
-        foreach ($form_data['items'] as $item) {
-            $name = $item['name'];
-            $type = isset($item['type']) ? $item['type'] : 'text';
-            $label = isset($item['label']) ? $item['label'] : '';
-            if ($type == 'wysiwyg') {
-                $element = $result->addHtmlEditor($name, $label);
-            } else {
-                $element = $result->addElement($type, $name, $label);
-            }
-            if (isset($item['attributes'])) {
-                $attributes = $item['attributes'];
-                $element->setAttributes($attributes);
-            }
-            if (isset($item['value'])) {
-                $value = $item['value'];
-                $element->setValue($value);
-            }
-            if (isset($item['default'])) {
-                $defaults[$name] = $item['default'];
-            }
-            if (isset($item['rules'])) {
-                $rules = $item['rules'];
-                foreach ($rules as $rule) {
-                    $message = $rule['message'];
-                    $type = $rule['type'];
-                    $format = isset($rule['format']) ? $rule['format'] : null;
-                    $validation = isset($rule['validation']) ? $rule['validation'] : 'server';
-                    $force = isset($rule['force']) ? $rule['force'] : false;
-                    $result->addRule($name, $message, $type, $format, $validation, $reset, $force);
-                }
-            }
-        }
-        $result->setDefaults($defaults);
-
-        return $result;
-    }
-
     /**
      * @return HTML_QuickForm_Renderer_Default
      */
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 4c5a041094..4e8f584024 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -109,7 +109,7 @@ class GroupManager
         $course_id = $course_info['real_id'];
         $table_group = Database::get_course_table(TABLE_GROUP);
 
-        $select = " g.id,
+        $select = ' g.id,
                     g.iid,
                     g.name,
                     g.description,
@@ -119,9 +119,9 @@ class GroupManager
                     g.self_registration_allowed,
                     g.self_unregistration_allowed,
                     g.session_id,
-                    g.status";
+                    g.status';
         if ($getCount) {
-            $select = " DISTINCT count(g.iid) as count ";
+            $select = ' DISTINCT count(g.iid) as count ';
         }
 
         $sql = "SELECT 
@@ -148,7 +148,7 @@ class GroupManager
         if (!empty($session_condition)) {
             $sql .= $session_condition;
         }
-        $sql .= "ORDER BY UPPER(g.name)";
+        $sql .= ' ORDER BY UPPER(g.name)';
 
         $result = Database::query($sql);
 
@@ -1685,15 +1685,19 @@ class GroupManager
      */
     public static function get_subscribed_users($groupInfo)
     {
+        if (empty($groupInfo)) {
+            return [];
+        }
+
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
         $table_group_user = Database::get_course_table(TABLE_GROUP_USER);
         $order_clause = api_sort_by_first_name() ? ' ORDER BY u.firstname, u.lastname' : ' ORDER BY u.lastname, u.firstname';
         $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
         if ($orderListByOfficialCode === 'true') {
-            $order_clause = " ORDER BY u.official_code, u.firstname, u.lastname";
+            $order_clause = ' ORDER BY u.official_code, u.firstname, u.lastname';
         }
 
-        $group_id = intval($groupInfo['id']);
+        $group_id = (int) $groupInfo['iid'];
 
         if (empty($group_id)) {
             return [];
@@ -1741,16 +1745,20 @@ class GroupManager
      */
     public static function get_subscribed_tutors($groupInfo, $id_only = false)
     {
+        if (empty($groupInfo)) {
+            return [];
+        }
+
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
         $table_group_tutor = Database::get_course_table(TABLE_GROUP_TUTOR);
         $order_clause = api_sort_by_first_name() ? ' ORDER BY u.firstname, u.lastname' : ' ORDER BY u.lastname, u.firstname';
 
         $orderListByOfficialCode = api_get_setting('order_user_list_by_official_code');
         if ($orderListByOfficialCode === 'true') {
-            $order_clause = " ORDER BY u.official_code, u.firstname, u.lastname";
+            $order_clause = ' ORDER BY u.official_code, u.firstname, u.lastname';
         }
 
-        $group_id = intval($groupInfo['id']);
+        $group_id = (int) $groupInfo['iid'];
         $course_id = api_get_course_int_id();
 
         $sql = "SELECT tg.id, u.user_id, u.lastname, u.firstname, u.email
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index c30abc5084..d5e71bc6f8 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1213,8 +1213,8 @@ class MessageManager
                     user_sender_id
                 FROM $table
                 WHERE
-                    user_sender_id = " . api_get_user_id() . " AND
-                    msg_status = " . MESSAGE_STATUS_OUTBOX . "
+                    user_sender_id = ".api_get_user_id()." AND
+                    msg_status = ".MESSAGE_STATUS_OUTBOX."
                     $keywordCondition
                 ORDER BY col$column $direction
                 LIMIT $from, $number_of_items";
@@ -1229,7 +1229,7 @@ class MessageManager
             $senderId = $row['user_sender_id'];
 
             if ($request === true) {
-                $message[0] = '<input type="checkbox" value=' . $messageId . ' name="out[]">';
+                $message[0] = '<input type="checkbox" value='.$messageId.' name="out[]">';
             } else {
                 $message[0] = $messageId;
             }
@@ -1238,29 +1238,29 @@ class MessageManager
             $title = Security::remove_XSS($title);
             $userInfo = api_get_user_info($senderId);
             if ($request === true) {
-                $message[1] = '<a onclick="show_sent_message(' . $messageId . ')" href="javascript:void(0)">' . $userInfo['complete_name_with_username'] . '</a>';
-                $message[2] = '<a onclick="show_sent_message(' . $messageId . ')" href="javascript:void(0)">' . str_replace(
+                $message[1] = '<a onclick="show_sent_message('.$messageId.')" href="javascript:void(0)">'.$userInfo['complete_name_with_username'].'</a>';
+                $message[2] = '<a onclick="show_sent_message('.$messageId.')" href="javascript:void(0)">'.str_replace(
                         "\\",
                         "",
                         $title
-                    ) . '</a>';
+                    ).'</a>';
                 //date stays the same
                 $message[3] = api_convert_and_format_date($sendDate, DATE_TIME_FORMAT_LONG);
-                $message[4] = '<a class="btn btn-outline-secondary btn-sm" title="' . addslashes(
+                $message[4] = '<a class="btn btn-outline-secondary btn-sm" title="'.addslashes(
                         get_lang('DeleteMessage')
-                    ) . '" onclick="delete_one_message_outbox(' . $messageId . ')" href="javascript:void(0)"  >' .
-                    Display::returnFontAwesomeIcon('trash', 2) . '</a>';
+                    ).'" onclick="delete_one_message_outbox('.$messageId.')" href="javascript:void(0)"  >'.
+                    Display::returnFontAwesomeIcon('trash', 2).'</a>';
             } else {
                 $message[1] = '<img class="rounded-circle mr-2" src="'.$userInfo['avatar_small'].'"/>';
-                $message[1].= $userInfo['complete_name_with_username'];
-                $message[2] = '<a ' . $class . ' onclick="show_sent_message(' . $messageId . ')" href="../messages/view_message.php?id_send=' . $messageId . '">' . $title . '</a>';
+                $message[1] .= $userInfo['complete_name_with_username'];
+                $message[2] = '<a '.$class.' onclick="show_sent_message('.$messageId.')" href="../messages/view_message.php?id_send='.$messageId.'">'.$title.'</a>';
                 $message[3] = api_convert_and_format_date($sendDate, DATE_TIME_FORMAT_LONG);
-                $message[4] = '<a class="btn btn-outline-secondary btn-sm" title="' . addslashes(
+                $message[4] = '<a class="btn btn-outline-secondary btn-sm" title="'.addslashes(
                         get_lang('DeleteMessage')
-                    ) . '" href="outbox.php?action=deleteone&id=' . $messageId . '"  onclick="javascript:if(!confirm(' . "'" . addslashes(
+                    ).'" href="outbox.php?action=deleteone&id='.$messageId.'"  onclick="javascript:if(!confirm('."'".addslashes(
                         api_htmlentities(get_lang('ConfirmDeleteMessage'))
-                    ) . "'" . ')) return false;" >' .
-                    Display::returnFontAwesomeIcon('trash', 'fa-sm') . '</a>';
+                    )."'".')) return false;" >'.
+                    Display::returnFontAwesomeIcon('trash', 'fa-sm').'</a>';
             }
 
             $message_list[] = $message;
@@ -2166,7 +2166,8 @@ class MessageManager
             2,
             20,
             'DESC',
-            null,'table-custom'
+            null,
+            'table-custom'
         );
         $table->set_header(0, '', false, ['style' => 'width:15px;']);
         $table->set_header(1, get_lang('Messages'), false);
diff --git a/main/inc/lib/pear/HTML/Common.php b/main/inc/lib/pear/HTML/Common.php
index 1e3b0a4ec1..201c460644 100755
--- a/main/inc/lib/pear/HTML/Common.php
+++ b/main/inc/lib/pear/HTML/Common.php
@@ -146,6 +146,7 @@ class HTML_Common
                 $strAttr .= ' ' . $key . '= "' . $value. '"';
             }
         }
+
         return $strAttr;
     }
 
@@ -155,7 +156,7 @@ class HTML_Common
      * @access   private
      * @return   array
      */
-    function _parseAttributes($attributes)
+    public function _parseAttributes($attributes)
     {
         if (is_array($attributes)) {
             $ret = array();
@@ -457,17 +458,6 @@ class HTML_Common
      */
     function charset($newCharset = null)
     {
-        // Modified by Ivan Tcholakov, 16-MAR-2010
-        //static $charset = 'ISO-8859-1';
-        static $charset;
-        if (!isset($charset)) {
-            $charset = api_get_system_encoding();
-        }
-        //
-
-        if (!is_null($newCharset)) {
-            $charset = $newCharset;
-        }
-        return $charset;
+        return 'UTF-8';
     } // end func charset
 }
diff --git a/main/inc/lib/pear/HTML/QuickForm.php b/main/inc/lib/pear/HTML/QuickForm.php
index f99904d26d..43b909c41f 100755
--- a/main/inc/lib/pear/HTML/QuickForm.php
+++ b/main/inc/lib/pear/HTML/QuickForm.php
@@ -350,19 +350,19 @@ class HTML_QuickForm extends HTML_Common
                 if (is_array($filter) && (2 != count($filter) || !is_callable($filter))) {
                     foreach ($filter as $val) {
                         if (!is_callable($val)) {
-                            throw new \Exception("Callback function does not exist in QuickForm::setDefaults()");
+                            throw new \Exception('Callback function does not exist in QuickForm::setDefaults()');
                         } else {
                             $defaultValues = $this->_recursiveFilter($val, $defaultValues);
                         }
                     }
                 } elseif (!is_callable($filter)) {
-                    throw new \Exception("Callback function does not exist in QuickForm::setDefaults()");
+                    throw new \Exception('Callback function does not exist in QuickForm::setDefaults()');
                 } else {
                     $defaultValues = $this->_recursiveFilter($filter, $defaultValues);
                 }
             }
 
-            $this->_defaultValues = HTML_QuickForm::arrayMerge($this->_defaultValues, $defaultValues);
+            $this->_defaultValues = self::arrayMerge($this->_defaultValues, $defaultValues);
             $this->_constantValues = $this->_defaultValues;
             foreach (array_keys($this->_elements) as $key) {
                 $this->_elements[$key]->onQuickFormEvent('updateValue', null, $this);
diff --git a/main/inc/lib/pear/HTML/QuickForm/Renderer.php b/main/inc/lib/pear/HTML/QuickForm/Renderer.php
index 7f6092bbcf..bbdc1c493b 100755
--- a/main/inc/lib/pear/HTML/QuickForm/Renderer.php
+++ b/main/inc/lib/pear/HTML/QuickForm/Renderer.php
@@ -155,4 +155,3 @@ class HTML_QuickForm_Renderer
         return;
     } // end func finishGroup
 } // end class HTML_QuickForm_Renderer
-?>
diff --git a/main/inc/lib/pear/HTML/QuickForm/checkbox.php b/main/inc/lib/pear/HTML/QuickForm/checkbox.php
index a59750a3b5..7e576f4ead 100755
--- a/main/inc/lib/pear/HTML/QuickForm/checkbox.php
+++ b/main/inc/lib/pear/HTML/QuickForm/checkbox.php
@@ -140,10 +140,11 @@ class HTML_QuickForm_checkbox extends HTML_QuickForm_input
         } elseif ($this->_flagFrozen) {
             $label = $this->_text;
         } else {
-            $className = $this->checkboxClass;
+            $labelClass = $this->labelClass;
+            $checkClass = $this->checkboxClass;
             $name = $this->_attributes['name'];
-            $label ='<div id="'.$name.'" class="'.$className.'_'.$name.'">
-                <label>' .
+            $label ='<div id="'.$name.'" class="'.$checkClass.'">
+                <label class="'.$labelClass.'">' .
                     HTML_QuickForm_input::toHtml().' '.$this->_text.
                 '</label>
                 </div>
diff --git a/main/inc/lib/pear/HTML/QuickForm/element.php b/main/inc/lib/pear/HTML/QuickForm/element.php
index 71c9e22f08..b02f3adeb5 100755
--- a/main/inc/lib/pear/HTML/QuickForm/element.php
+++ b/main/inc/lib/pear/HTML/QuickForm/element.php
@@ -43,17 +43,15 @@ class HTML_QuickForm_element extends HTML_Common
     /**
      * Label of the field
      * @var       string
-     * @since     1.3
-     * @access    private
      */
-    var $_label = '';
+    public $_label = '';
 
     /**
      * Label "for" a field... (Chamilo LMS customization)
      * @var     string
      * @access  private
      */
-    var $_label_for = '';
+    public $_label_for = '';
 
     /**
      * Form element type
@@ -61,7 +59,7 @@ class HTML_QuickForm_element extends HTML_Common
      * @since     1.0
      * @access    private
      */
-    var $_type = '';
+    public $_type = '';
 
     /**
      * Flag to tell if element is frozen
@@ -69,7 +67,7 @@ class HTML_QuickForm_element extends HTML_Common
      * @since     1.0
      * @access    private
      */
-    var $_flagFrozen = false;
+    public $_flagFrozen = false;
 
     /**
      * Does the element support persistant data when frozen
@@ -77,7 +75,7 @@ class HTML_QuickForm_element extends HTML_Common
      * @since     1.3
      * @access    private
      */
-    var $_persistantFreeze = false;
+    public $_persistantFreeze = false;
 
     protected $columnsSize;
 
@@ -179,9 +177,6 @@ class HTML_QuickForm_element extends HTML_Common
         return 3.2;
     } // end func apiVersion
 
-    // }}}
-    // {{{ getType()
-
     /**
      * Returns element type
      *
@@ -194,9 +189,6 @@ class HTML_QuickForm_element extends HTML_Common
         return $this->_type;
     } // end func getType
 
-    // }}}
-    // {{{ setName()
-
     /**
      * Sets the input field name
      *
@@ -207,12 +199,8 @@ class HTML_QuickForm_element extends HTML_Common
      */
     public function setName($name)
     {
-        // interface method
     } //end func setName
 
-    // }}}
-    // {{{ getName()
-
     /**
      * Returns the element name
      *
@@ -222,12 +210,8 @@ class HTML_QuickForm_element extends HTML_Common
      */
     public function getName()
     {
-        // interface method
     } //end func getName
 
-    // }}}
-    // {{{ setValue()
-
     /**
      * Sets the value of the form element
      *
@@ -238,12 +222,8 @@ class HTML_QuickForm_element extends HTML_Common
      */
     public function setValue($value)
     {
-        // interface
     } // end func setValue
 
-    // }}}
-    // {{{ getValue()
-
     /**
      * Returns the value of the form element
      *
@@ -253,12 +233,30 @@ class HTML_QuickForm_element extends HTML_Common
      */
     public function getValue()
     {
-        // interface
         return null;
     } // end func getValue
 
-    // }}}
-    // {{{ freeze()
+    /**
+     * @return string
+     */
+    public function getCleanValue()
+    {
+        $value = $this->cleanValueFromParameter($this->getValue());
+
+        return $value;
+    }
+
+    /**
+     * @param string $value
+     *
+     * @return string
+     */
+    public function cleanValueFromParameter($value)
+    {
+        $value = @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset());
+
+        return $value;
+    }
 
     /**
      * Freeze the element so that only its value is returned
@@ -271,9 +269,6 @@ class HTML_QuickForm_element extends HTML_Common
         $this->_flagFrozen = true;
     } //end func freeze
 
-    // }}}
-    // {{{ unfreeze()
-
    /**
     * Unfreezes the element so that it becomes editable
     *
@@ -286,9 +281,6 @@ class HTML_QuickForm_element extends HTML_Common
         $this->_flagFrozen = false;
     }
 
-    // }}}
-    // {{{ getFrozenHtml()
-
     /**
      * Returns the value of field without HTML tags
      *
@@ -302,12 +294,16 @@ class HTML_QuickForm_element extends HTML_Common
         // Modified by Ivan Tcholakov, 16-MAR-2010.
         //return ('' != $value? htmlspecialchars($value): '&nbsp;') .
         //       $this->_getPersistantData();
+        if (!empty($value)) {
+            $value = $this->getCleanValue();
+        } else {
+            $value = '&nbsp;';
+        }
+
+        $value .= $this->_getPersistantData();
 
-        $value =  ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()): '&nbsp;') .
-               $this->_getPersistantData();
         return '<span class="freeze">'.$value.'</span>';
-        //
-    } //end func getFrozenHtml
+    }
 
    /**
     * Used by getFrozenHtml() to pass the element's value if _persistantFreeze is on
@@ -329,9 +325,6 @@ class HTML_QuickForm_element extends HTML_Common
         }
     }
 
-    // }}}
-    // {{{ isFrozen()
-
     /**
      * Returns whether or not the element is frozen
      *
@@ -344,9 +337,6 @@ class HTML_QuickForm_element extends HTML_Common
         return $this->_flagFrozen;
     } // end func isFrozen
 
-    // }}}
-    // {{{ setPersistantFreeze()
-
     /**
      * Sets wether an element value should be kept in an hidden field
      * when the element is frozen or not
@@ -361,9 +351,6 @@ class HTML_QuickForm_element extends HTML_Common
         $this->_persistantFreeze = $persistant;
     } //end func setPersistantFreeze
 
-    // }}}
-    // {{{ setLabel()
-
     /**
      * Sets display text for the element
      *
@@ -381,9 +368,6 @@ class HTML_QuickForm_element extends HTML_Common
         }
     } //end func setLabel
 
-    // }}}
-    // {{{ getLabel()
-
     /**
      * Returns display text for the element
      *
@@ -407,9 +391,6 @@ class HTML_QuickForm_element extends HTML_Common
         return $this->_label_for;
     } //end func getLabelFor
 
-    // }}}
-    // {{{ _findValue()
-
     /**
      * Tries to find the element value from the values array
      *
@@ -451,9 +432,6 @@ class HTML_QuickForm_element extends HTML_Common
         }
     } //end func _findValue
 
-    // }}}
-    // {{{ onQuickFormEvent()
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
@@ -547,9 +525,6 @@ class HTML_QuickForm_element extends HTML_Common
         return $this->_prepareValue($value, $assoc);
     }
 
-    // }}}
-    // {{{ _prepareValue()
-
    /**
     * Used by exportValue() to prepare the value for returning
     *
diff --git a/main/inc/lib/pear/HTML/QuickForm/file.php b/main/inc/lib/pear/HTML/QuickForm/file.php
index 5bf3daecb6..ff91cd096a 100755
--- a/main/inc/lib/pear/HTML/QuickForm/file.php
+++ b/main/inc/lib/pear/HTML/QuickForm/file.php
@@ -268,8 +268,7 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
                 $image = $(\'#'.$id.'_preview_image\'),
                 $input = $(\'[name="'.$id.'_crop_result"]\'),
                 $cropButton = $(\'#'.$id.'_crop_button\'),
-                $formGroup = $(\'#'.$id.'-form-group\');
-                
+                $formGroup = $(\'#'.$id.'-form-group\');                
 
             function isValidType(file) {
                 var fileTypes = [\'image/jpg\', \'image/jpeg\', \'image/gif\', \'image/png\'];
diff --git a/main/inc/lib/pear/HTML/QuickForm/input.php b/main/inc/lib/pear/HTML/QuickForm/input.php
index 7e82536189..ac16c7756a 100755
--- a/main/inc/lib/pear/HTML/QuickForm/input.php
+++ b/main/inc/lib/pear/HTML/QuickForm/input.php
@@ -1,6 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
 /**
  * Base class for <input /> form elements
  *
@@ -35,8 +33,6 @@
  */
 class HTML_QuickForm_input extends HTML_QuickForm_element
 {
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -52,9 +48,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         parent::__construct($elementName, $elementLabel, $attributes);
     } //end constructor
 
-    // }}}
-    // {{{ setType()
-
     /**
      * Sets the element type
      *
@@ -69,9 +62,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         $this->updateAttributes(array('type'=>$type));
     } // end func setType
 
-    // }}}
-    // {{{ setName()
-
     /**
      * Sets the input field name
      *
@@ -85,9 +75,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         $this->updateAttributes(array('name'=>$name));
     } //end func setName
 
-    // }}}
-    // {{{ getName()
-
     /**
      * Returns the element name
      *
@@ -100,9 +87,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         return $this->getAttribute('name');
     } //end func getName
 
-    // }}}
-    // {{{ setValue()
-
     /**
      * Sets the value of the form element
      *
@@ -116,9 +100,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         $this->updateAttributes(array('value'=>$value));
     } // end func setValue
 
-    // }}}
-    // {{{ getValue()
-
     /**
      * Returns the value of the form element
      *
@@ -131,9 +112,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         return $this->getAttribute('value');
     } // end func getValue
 
-    // }}}
-    // {{{ toHtml()
-
     /**
      * Returns the input field in HTML
      *
@@ -150,9 +128,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         }
     } //end func toHtml
 
-    // }}}
-    // {{{ onQuickFormEvent()
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/main/inc/lib/pear/HTML/QuickForm/label.php b/main/inc/lib/pear/HTML/QuickForm/label.php
index acaa3f46e2..d4e533f949 100755
--- a/main/inc/lib/pear/HTML/QuickForm/label.php
+++ b/main/inc/lib/pear/HTML/QuickForm/label.php
@@ -19,8 +19,6 @@
  */
 class HTML_QuickForm_label extends HTML_QuickForm_static
 {
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -36,12 +34,4 @@ class HTML_QuickForm_label extends HTML_QuickForm_static
         parent::__construct(null, $label, $text, $attributes);
         $this->_type = 'html';
     }
-
-    /**
-     * @return string
-     */
-    public function toHtml()
-    {
-        return parent::toHtml();
-    }
 }
diff --git a/main/inc/lib/pear/HTML/QuickForm/link.php b/main/inc/lib/pear/HTML/QuickForm/link.php
index ee786a169b..84997b4cb8 100755
--- a/main/inc/lib/pear/HTML/QuickForm/link.php
+++ b/main/inc/lib/pear/HTML/QuickForm/link.php
@@ -188,8 +188,4 @@ class HTML_QuickForm_link extends HTML_QuickForm_static
     {
         return;
     } //end func getFrozenHtml
-
-    // }}}
-
 } //end class HTML_QuickForm_textarea
-?>
diff --git a/main/inc/lib/pear/HTML/QuickForm/reset.php b/main/inc/lib/pear/HTML/QuickForm/reset.php
index 5de49e9653..326fb1a756 100755
--- a/main/inc/lib/pear/HTML/QuickForm/reset.php
+++ b/main/inc/lib/pear/HTML/QuickForm/reset.php
@@ -2,8 +2,6 @@
 
 class HTML_QuickForm_reset extends HTML_QuickForm_button
 {
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -22,9 +20,6 @@ class HTML_QuickForm_reset extends HTML_QuickForm_button
         $this->setType('reset');
     } //end constructor
 
-    // }}}
-    // {{{ freeze()
-
     /**
      * Freeze the element so that only its value is returned
      *
@@ -35,7 +30,4 @@ class HTML_QuickForm_reset extends HTML_QuickForm_button
     {
         return false;
     } //end func freeze
-
-    // }}}
-
 }
diff --git a/main/inc/lib/pear/HTML/QuickForm/static.php b/main/inc/lib/pear/HTML/QuickForm/static.php
index 24f3fecc23..4e1f1b276a 100755
--- a/main/inc/lib/pear/HTML/QuickForm/static.php
+++ b/main/inc/lib/pear/HTML/QuickForm/static.php
@@ -32,9 +32,6 @@
  */
 class HTML_QuickForm_static extends HTML_QuickForm_element
 {
-
-    // {{{ properties
-
     /**
      * Display text
      * @var       string
@@ -42,9 +39,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
      */
     var $_text = null;
 
-    // }}}
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -61,9 +55,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         $this->_text = $text;
     } //end constructor
 
-    // }}}
-    // {{{ setName()
-
     /**
      * Sets the element name
      *
@@ -76,9 +67,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         $this->updateAttributes(array('name'=>$name));
     } //end func setName
 
-    // }}}
-    // {{{ getName()
-
     /**
      * Returns the element name
      *
@@ -90,9 +78,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         return $this->getAttribute('name');
     } //end func getName
 
-    // }}}
-    // {{{ setText()
-
     /**
      * Sets the text
      *
@@ -105,9 +90,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         $this->_text = $text;
     } // end func setText
 
-    // }}}
-    // {{{ setValue()
-
     /**
      * Sets the text (uses the standard setValue call to emulate a form element.
      *
@@ -120,9 +102,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         $this->setText($text);
     } // end func setValue
 
-    // }}}
-    // {{{ toHtml()
-
     /**
      * Returns the static text element in HTML
      *
@@ -134,9 +113,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         return $this->_getTabs() . $this->_text;
     } //end func toHtml
 
-    // }}}
-    // {{{ getFrozenHtml()
-
     /**
      * Returns the value of field without HTML tags
      *
@@ -148,9 +124,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         return $this->toHtml();
     } //end func getFrozenHtml
 
-    // }}}
-    // {{{ onQuickFormEvent()
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
@@ -181,9 +154,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element
         return true;
     } // end func onQuickFormEvent
 
-    // }}}
-    // {{{ exportValue()
-
    /**
     * We override this here because we don't want any values from static elements
     */
diff --git a/main/inc/lib/pear/HTML/QuickForm/submit.php b/main/inc/lib/pear/HTML/QuickForm/submit.php
index 65f6ee8a5b..48faf62c05 100755
--- a/main/inc/lib/pear/HTML/QuickForm/submit.php
+++ b/main/inc/lib/pear/HTML/QuickForm/submit.php
@@ -34,8 +34,6 @@
  */
 class HTML_QuickForm_submit extends HTML_QuickForm_input
 {
-    // {{{ constructor
-
     /**
      * Class constructor
      *
@@ -53,9 +51,6 @@ class HTML_QuickForm_submit extends HTML_QuickForm_input
         $this->setType('submit');
     } //end constructor
 
-    // }}}
-    // {{{ freeze()
-
     /**
      * Freeze the element so that only its value is returned
      *
@@ -67,9 +62,6 @@ class HTML_QuickForm_submit extends HTML_QuickForm_input
         return false;
     } //end func freeze
 
-    // }}}
-    // {{{ exportValue()
-
    /**
     * Only return the value if it is found within $submitValues (i.e. if
     * this particular submit button was clicked)
@@ -78,4 +70,5 @@ class HTML_QuickForm_submit extends HTML_QuickForm_input
     {
         return $this->_prepareValue($this->_findValue($submitValues), $assoc);
     }
-}
\ No newline at end of file
+
+}
diff --git a/main/inc/lib/pear/HTML/QuickForm/textarea.php b/main/inc/lib/pear/HTML/QuickForm/textarea.php
index 7906b1e5b7..a9e87ef5d2 100755
--- a/main/inc/lib/pear/HTML/QuickForm/textarea.php
+++ b/main/inc/lib/pear/HTML/QuickForm/textarea.php
@@ -40,7 +40,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
      * @since     1.0
      * @access    private
      */
-    public $_value = null;
+    public $_value;
 
     /**
      * Class constructor
@@ -62,6 +62,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         parent::__construct($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
         $this->_type = 'textarea';
+        $this->_value = null;
     }
 
     /**
@@ -77,9 +78,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->updateAttributes(array('name'=>$name));
     } //end func setName
 
-    // }}}
-    // {{{ getName()
-
     /**
      * Returns the element name
      *
@@ -92,9 +90,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         return $this->getAttribute('name');
     } //end func getName
 
-    // }}}
-    // {{{ setValue()
-
     /**
      * Sets value for textarea element
      *
@@ -108,9 +103,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->_value = $value;
     } //end func setValue
 
-    // }}}
-    // {{{ getValue()
-
     /**
      * Returns the value of the form element
      *
@@ -123,9 +115,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         return $this->_value;
     } // end func getValue
 
-    // }}}
-    // {{{ setWrap()
-
     /**
      * Sets wrap type for textarea element
      *
@@ -139,9 +128,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->updateAttributes(array('wrap' => $wrap));
     } //end func setWrap
 
-    // }}}
-    // {{{ setRows()
-
     /**
      * Sets height in rows for textarea element
      *
@@ -155,9 +141,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->updateAttributes(array('rows' => $rows));
     } //end func setRows
 
-    // }}}
-    // {{{ setCols()
-
     /**
      * Sets width in cols for textarea element
      *
@@ -171,9 +154,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->updateAttributes(array('cols' => $cols));
     } //end func setCols
 
-    // }}}
-    // {{{ toHtml()
-
     /**
      * Returns the textarea element in HTML
      *
@@ -206,10 +186,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
      */
     public function getFrozenHtml()
     {
-        // Modified by Ivan Tcholakov, 16-MAR-2010.
-        //$value = htmlspecialchars($this->getValue());
-        $value = @htmlspecialchars($this->getValue(), ENT_COMPAT, HTML_Common::charset());
-        //
+        $value = $this->getCleanValue();
         if ($this->getAttribute('wrap') == 'off') {
             $html = $this->_getTabs() . '<pre>' . $value."</pre>\n";
         } else {
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 2968dea69b..58b930c8b8 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -320,8 +320,11 @@ class SocialManager extends UserManager
                     msg_status='.MESSAGE_STATUS_INVITATION_PENDING;
         $res = Database::query($sql);
         $row = Database::fetch_array($res, 'ASSOC');
+        if ($row) {
+            return (int) $row['count_message_in_box'];
+        }
 
-        return $row['count_message_in_box'];
+        return 0;
     }
 
     /**
diff --git a/main/inc/lib/sortable_table.class.php b/main/inc/lib/sortable_table.class.php
index 37dd0f2390..9f097bc0d1 100755
--- a/main/inc/lib/sortable_table.class.php
+++ b/main/inc/lib/sortable_table.class.php
@@ -104,16 +104,16 @@ class SortableTable extends HTML_Table
     /**
      * Create a new SortableTable.
      *
-     * @param string $table_name A name for the table (default = 'table')
+     * @param string $table_name                A name for the table (default = 'table')
      * @param string $get_total_number_function A user defined function to get
      *                                          the total number of items in the table
-     * @param string $get_data_function A function to get the data to display on
+     * @param string $get_data_function         A function to get the data to display on
      *                                          the current page
-     * @param int $default_column The default column on which the data should be
+     * @param int    $default_column            The default column on which the data should be
      *                                          sorted
-     * @param int $default_items_per_page The default number of items to show
+     * @param int    $default_items_per_page    The default number of items to show
      *                                          on one page
-     * @param string $default_order_direction The default order direction;
+     * @param string $default_order_direction   The default order direction;
      *                                          either the constant 'ASC' or 'DESC'
      * @param string $table_id
      * @param string $style
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index a3d10d6e70..2fead9a5cc 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -827,6 +827,7 @@ class IndexManager
                 'link' => api_get_path(WEB_PATH).'main/messages/inbox.php',
                 'title' => get_lang('Inbox').$cant_msg,
             ];
+
             $items[] = [
                 'class' => 'new-message-social',
                 'icon' => Display::return_icon('new-message.png', get_lang('Compose')),
@@ -842,6 +843,13 @@ class IndexManager
                     'link' => api_get_path(WEB_PATH).'main/social/invitations.php',
                     'title' => get_lang('PendingInvitations').$total_invitations,
                 ];
+            } else {
+                $items[] = [
+                    'class' => 'personal-data',
+                    'icon' => Display::return_icon('database.png', get_lang('PersonalDataReport')),
+                    'link' => api_get_path(WEB_CODE_PATH).'social/personal_data.php',
+                    'title' => get_lang('PersonalDataReport'),
+                ];
             }
 
             if (api_get_configuration_value('allow_my_files_link_in_homepage')) {
@@ -889,7 +897,6 @@ class IndexManager
         }
 
         if (true === api_get_configuration_value('whispeak_auth_enabled')) {
-            //if (!WhispeakAuthPlugin::checkUserIsEnrolled($userId)) {
             $itemTitle = WhispeakAuthPlugin::create()->get_title();
 
             $items[] = [
@@ -898,7 +905,6 @@ class IndexManager
                 'link' => WhispeakAuthPlugin::getEnrollmentUrl(),
                 'title' => $itemTitle,
             ];
-            //}
         }
 
         return $items;
diff --git a/main/inc/lib/zombie/zombie_manager.class.php b/main/inc/lib/zombie/zombie_manager.class.php
index 794f7abb4d..ff17529aff 100755
--- a/main/inc/lib/zombie/zombie_manager.class.php
+++ b/main/inc/lib/zombie/zombie_manager.class.php
@@ -28,8 +28,14 @@ class ZombieManager
      *
      * @return ResultSet
      */
-    public static function listZombies($ceiling, $active_only = true, $count = 0, $from = 10, $column = 'user.firstname', $direction = 'desc')
-    {
+    public static function listZombies(
+        $ceiling,
+        $active_only = true,
+        $from = 0,
+        $count = 10,
+        $column = 'user.firstname',
+        $direction = 'desc'
+    ) {
         if (empty($column)) {
             $column = 'user.firstname';
         }
@@ -41,6 +47,7 @@ class ZombieManager
 
         $sql = 'SELECT
                     user.user_id,
+                    user.official_code,
                     user.firstname,
                     user.lastname,
                     user.username,
@@ -74,15 +81,17 @@ class ZombieManager
                         access.login_date <= '$ceiling' AND
                         user.user_id = access.login_user_id";
         }
+
         if ($active_only) {
             $sql .= ' AND user.active = 1';
         }
 
+        $sql .= " ORDER BY $column $direction";
+        if (!is_null($from) && !is_null($count)) {
         $count = intval($count);
         $from = intval($from);
-
-        $sql .= " ORDER BY $column $direction";
-        $sql .= " LIMIT $count, $from ";
+            $sql .= " LIMIT $from, $count ";
+        }
 
         $result = Database::query($sql);
 
@@ -94,7 +103,7 @@ class ZombieManager
      */
     public static function deactivate_zombies($ceiling)
     {
-        $zombies = self::list_zombies($ceiling);
+        $zombies = self::listZombies($ceiling);
         $ids = [];
         foreach ($zombies as $zombie) {
             $ids[] = $zombie['user_id'];
diff --git a/main/inc/lib/zombie/zombie_report.class.php b/main/inc/lib/zombie/zombie_report.class.php
index 8948bdc38a..99fbcc434b 100755
--- a/main/inc/lib/zombie/zombie_report.class.php
+++ b/main/inc/lib/zombie/zombie_report.class.php
@@ -34,9 +34,6 @@ class ZombieReport implements Countable
     public function get_parameters()
     {
         $result = [
-            'name' => 'zombie_report_parameters',
-            'method' => 'GET',
-            'attributes' => ['class' => 'well form-horizontal form-search'],
             'items' => [
                 [
                     'name' => 'ceiling',
@@ -44,10 +41,6 @@ class ZombieReport implements Countable
                     'type' => 'date_picker',
                     'default' => $this->get_ceiling('Y-m-d'),
                     'rules' => [
-//                        array(
-//                            'type' => 'required',
-//                            'message' => get_lang('Required')
-//                        ),
                         [
                             'type' => 'date',
                             'message' => get_lang('Date'),
@@ -68,14 +61,6 @@ class ZombieReport implements Countable
                 ],
             ],
         ];
-        $additional_parameters = $this->get_additional_parameters();
-        foreach ($additional_parameters as $key => $value) {
-            $result['items'][] = [
-                'type' => 'hidden',
-                'name' => $key,
-                'value' => $value,
-            ];
-        }
 
         return $result;
     }
@@ -85,31 +70,37 @@ class ZombieReport implements Countable
      */
     public function get_parameters_form()
     {
-        $parameters = $this->get_parameters();
-        if (empty($parameters)) {
-            return null;
-        }
-        if (empty($this->parameters_form)) {
-            $this->parameters_form = new FormValidator(
-                $parameters['name'],
-                $parameters['method'],
+        $form = new FormValidator(
+            'zombie_report_parameters',
+            'get',
                 null,
                 null,
-                $parameters['attributes']
+            ['class' => 'well form-horizontal form-search']
             );
+
+        $form->addDatePicker('ceiling', get_lang('LastAccess'));
+        $form->addCheckBox('active_only', get_lang('ActiveOnly'));
+        $form->addButtonSearch(get_lang('Search'));
+
+        $params = [
+            'active_only' => $this->get_active_only(),
+            'ceiling' => $this->get_ceiling('Y-m-d'),
+        ];
+        $form->setDefaults($params);
+        $additional = $this->get_additional_parameters();
+        foreach ($additional as $key => $value) {
+            $value = Security::remove_XSS($value);
+            $form->addHidden($key, $value);
         }
 
-        return $this->parameters_form;
+        return $form;
     }
 
     public function display_parameters($return = false)
     {
         $form = $this->get_parameters_form();
-        if (empty($form)) {
-            return '';
-        }
-
         $result = $form->returnForm();
+
         if ($return) {
             return $result;
         } else {
@@ -120,9 +111,6 @@ class ZombieReport implements Countable
     public function is_valid()
     {
         $form = $this->get_parameters_form();
-        if (empty($form)) {
-            return true;
-        }
 
         return $form->isSubmitted() == false || $form->validate();
     }
@@ -175,57 +163,39 @@ class ZombieReport implements Countable
         }
 
         $action = $this->get_action();
-        $f = [$this, 'action_'.$action];
-        if (is_callable($f)) {
-            return call_user_func($f, $ids);
+        switch ($action) {
+            case 'activate':
+                return UserManager::activate_users($ids);
+                break;
+            case 'deactivate':
+                return UserManager::deactivate_users($ids);
+                break;
+            case 'delete':
+                return UserManager::delete_users($ids);
         }
 
         return false;
     }
 
-    public function action_deactivate($ids)
-    {
-        return UserManager::deactivate_users($ids);
-    }
-
-    public function action_activate($ids)
-    {
-        return UserManager::activate_users($ids);
-    }
-
-    public function action_delete($ids)
-    {
-        return UserManager::delete_users($ids);
-    }
-
     public function count()
     {
-        if (!$this->is_valid()) {
-            return 0;
-        }
-
         $ceiling = $this->get_ceiling();
         $active_only = $this->get_active_only();
-        $items = ZombieManager::listZombies($ceiling, $active_only);
+        $items = ZombieManager::listZombies($ceiling, $active_only, null, null);
 
         return count($items);
     }
 
     public function get_data($from, $count, $column, $direction)
     {
-        if (!$this->is_valid()) {
-            return [];
-        }
-
         $ceiling = $this->get_ceiling();
         $active_only = $this->get_active_only();
-
-        $items = ZombieManager::listZombies($ceiling, $active_only, $count, $from, $column, $direction);
+        $items = ZombieManager::listZombies($ceiling, $active_only, $from, $count, $column, $direction);
         $result = [];
         foreach ($items as $item) {
             $row = [];
             $row[] = $item['user_id'];
-            $row[] = $item['code'];
+            $row[] = $item['official_code'];
             $row[] = $item['firstname'];
             $row[] = $item['lastname'];
             $row[] = $item['username'];
@@ -253,12 +223,12 @@ class ZombieReport implements Countable
         $additional_parameters = $this->get_additional_parameters();
         $parameters = array_merge($additional_parameters, $parameters);
 
-        $table = new SortableTable('users', $count, $data, 1, 50);
+        $table = new SortableTable('zombie_users', $count, $data, 1, 50);
         $table->set_additional_parameters($parameters);
 
         $col = 0;
         $table->set_header($col++, '', false);
-        $table->set_header($col++, get_lang('Code'));
+        $table->set_header($col++, get_lang('OfficialCode'));
         $table->set_header($col++, get_lang('FirstName'));
         $table->set_header($col++, get_lang('LastName'));
         $table->set_header($col++, get_lang('LoginName'));
@@ -267,7 +237,7 @@ class ZombieReport implements Countable
         $table->set_header($col++, get_lang('AuthenticationSource'));
         $table->set_header($col++, get_lang('RegisteredDate'));
         $table->set_header($col++, get_lang('LastAccess'), false);
-        $table->set_header($col++, get_lang('Active'), false);
+        $table->set_header($col, get_lang('Active'), false);
 
         $table->set_column_filter(5, [$this, 'format_email']);
         $table->set_column_filter(6, [$this, 'format_status']);
@@ -295,7 +265,7 @@ class ZombieReport implements Countable
      */
     public function format_active($active)
     {
-        $active = ($active == '1');
+        $active = $active == '1';
         if ($active) {
             $image = 'accept';
             $text = get_lang('Yes');
@@ -324,14 +294,14 @@ class ZombieReport implements Countable
     public function display($return = false)
     {
         $result = $this->display_parameters($return);
-        if ($this->perform_action()) {
-            if ($return) {
-                $result .= Display::return_message(get_lang('Done'), 'confirmation');
-            } else {
-                echo Display::return_message(get_lang('Done'), 'confirmation');
-            }
+        $valid = $this->perform_action();
+
+        if ($valid) {
+            echo Display::return_message(get_lang('Updated'), 'confirmation');
         }
+
         $result .= $this->display_data($return);
+
         if ($return) {
             return $result;
         }
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index be28991cef..09b84bdc6d 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -429,6 +429,8 @@ function write_system_config_file($path)
                 Your problems can be related on two possible causes:<br />
                 <ul>
                   <li>Permission problems.<br />Try initially with <em>chmod -R 777</em> and increase restrictions gradually.</li>
+                  <li>PHP is running in <a href="http://www.php.net/manual/en/features.safe-mode.php" target="_blank">Safe-Mode</a>. 
+                  If possible, try to switch it off.</li>
                 </ul>
                 <a href="http://forum.chamilo.org/" target="_blank">Read about this problem in Support Forum</a><br /><br />
                 Please go back to step 5.
@@ -577,6 +579,8 @@ function get_config_param($param, $updatePath = '')
  */
 function get_config_param_from_db($param = '')
 {
+    $param = Database::escape_string($param);
+
     if (($res = Database::query("SELECT * FROM settings_current WHERE variable = '$param'")) !== false) {
         if (Database::num_rows($res) > 0) {
             $row = Database::fetch_array($res);
@@ -1960,12 +1964,17 @@ function updateDirAndFilesPermissions()
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
-    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."'
-              WHERE variable  = 'permissions_for_new_directories'";
-    Database::query($sql);
+    Database::update(
+        $table,
+        ['selected_value' => '0'.decoct($permissions_for_new_directories)],
+        ['variable = ?' => 'permissions_for_new_directories']
+    );
 
-    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
-    Database::query($sql);
+    Database::update(
+        $table,
+        ['selected_value' => '0'.decoct($permissions_for_new_files)],
+        ['variable = ?' => 'permissions_for_new_files']
+    );
 
     if (isset($_SESSION['permissions_for_new_directories'])) {
         unset($_SESSION['permissions_for_new_directories']);
@@ -2324,9 +2333,8 @@ function fixIds(EntityManager $em)
 
     // Delete group data of groups that don't exist.
     $sql = "DELETE FROM c_item_property
-            WHERE to_group_id IS NOT NULL AND to_group_id NOT IN (SELECT DISTINCT id FROM c_group_info)";
+            WHERE to_group_id <> 0 AND to_group_id IS NOT NULL AND to_group_id NOT IN (SELECT DISTINCT iid FROM c_group_info)";
     $connection->executeQuery($sql);
-
     // This updates the group_id with c_group_info.iid instead of c_group_info.id
 
     if ($debug) {
@@ -2399,7 +2407,8 @@ function fixIds(EntityManager $em)
             $ref = $item['ref'];
 
             // Fix group id
-            if (!empty($groupId)) {
+            // Commented group id is already fixed in Version20150603181728.php
+            /*if (!empty($groupId)) {
                 $sql = "SELECT * FROM c_group_info
                         WHERE c_id = $courseId AND id = $groupId";
                 $data = $connection->fetchAssoc($sql);
@@ -2413,7 +2422,7 @@ function fixIds(EntityManager $em)
                     $sql = "DELETE FROM c_item_property WHERE iid = $iid";
                     $connection->executeQuery($sql);
                 }
-            }
+            }*/
 
             $sql = '';
             $newId = '';
@@ -3259,9 +3268,7 @@ function finishInstallationWithContainer(
 
     $manager = Database::getManager();
     $connection = $manager->getConnection();
-
     $sql = getVersionTable();
-
     // Add version table
     $connection->executeQuery($sql);
 
@@ -3412,8 +3419,11 @@ function finishInstallationWithContainer(
     );
 
     // Set default language
-    $sql = "UPDATE language SET available = 1 WHERE dokeos_folder = '$languageForm'";
-    Database::query($sql);
+    Database::update(
+        Database::get_main_table(TABLE_MAIN_LANGUAGE),
+        ['available' => 1],
+        ['dokeos_folder = ?' => $languageForm]
+    );
 
     // Install settings
     installSettings(
@@ -3502,14 +3512,21 @@ function installProfileSettings($installationProfile = '')
     if (!empty($params->parent)) {
         installProfileSettings($params->parent);
     }
+
+    $tblSettings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+
     foreach ($settings as $id => $param) {
-        $sql = "UPDATE settings_current
-                SET selected_value = '".$param->selected_value."'
-                WHERE variable = '".$param->variable."'";
+        $conditions = ['variable = ? ' => $param->variable];
+
         if (!empty($param->subkey)) {
-            $sql .= " AND subkey='".$param->subkey."'";
+            $conditions['AND subkey = ? '] = $param->subkey;
         }
-        Database::query($sql);
+
+        Database::update(
+            $tblSettings,
+            ['selected_value' => $param->selected_value],
+            $conditions
+        );
     }
 
     return true;
@@ -3538,6 +3555,16 @@ function rrmdir($dir)
     }
 }
 
+/**
+ * @param        $id
+ * @param string $type
+ * @param bool   $preview
+ * @param bool   $anonymous
+ *
+ * @throws \Doctrine\DBAL\DBALException
+ *
+ * @return array
+ */
 function get_group_picture_path_by_id($id, $type = 'web', $preview = false, $anonymous = false)
 {
     switch ($type) {
@@ -3596,6 +3623,8 @@ function get_group_picture_path_by_id($id, $type = 'web', $preview = false, $ano
  * @param EntityManager $manager
  * @param bool          $processFiles
  *
+ * @throws \Doctrine\DBAL\DBALException
+ *
  * @return bool Always returns true except if the process is broken
  */
 function migrateSwitch($fromVersion, $manager, $processFiles = true)
@@ -3668,7 +3697,6 @@ function migrateSwitch($fromVersion, $manager, $processFiles = true)
         case '1.10.2':
         case '1.10.4':
         case '1.10.6':
-        case '1.10.8':
         case '1.10.8':
             $database = new Database();
             $database->setManager($manager);
@@ -3735,6 +3763,8 @@ function migrateSwitch($fromVersion, $manager, $processFiles = true)
 
 /**
  * @param \Doctrine\DBAL\Connection $connection
+ *
+ * @throws \Doctrine\DBAL\DBALException
  */
 function fixPostGroupIds($connection)
 {
@@ -3790,26 +3820,36 @@ function fixPostGroupIds($connection)
         $courseId = $row['c_id'];
         $sessionId = $row['session_id'];
         $workId = $row['id'];
-        $itemInfo = api_get_item_property_info(
-            $courseId,
-            'work',
-            $workId,
-            $sessionId
-        );
-        $courseInfo = api_get_course_info_by_id($courseId);
+        $sessionCondition = " session_id = $sessionId";
+        if (empty($sessionId)) {
+            $sessionCondition = ' (session_id = 0 OR session_id IS NULL) ';
+        }
+        $sql = "SELECT * FROM c_item_property
+                WHERE
+                    c_id = $courseId AND
+                    tool = 'work' AND
+                    ref = $workId AND
+                    $sessionCondition ";
+        $itemInfo = $connection->fetchAssoc($sql);
         if (empty($itemInfo)) {
-            api_item_property_update(
-                $courseInfo,
-                'work',
-                $workId,
-                'visible',
-                1,
-                $groupId,
-                null,
-                null,
-                null,
-                $sessionId
-            );
+            $params = [
+                'c_id' => $courseId,
+                'to_group_id' => $groupId,
+                //'to_user_id' => null,
+                'insert_user_id' => 1,
+                'session_id' => $sessionId,
+                'tool' => 'work',
+                'insert_date' => api_get_utc_datetime(),
+                'lastedit_date' => api_get_utc_datetime(),
+                'ref' => $workId,
+                'lastedit_type' => 'visible',
+                'lastedit_user_id' => 1,
+                'visibility' => 1,
+            ];
+            $connection->insert('c_item_property', $params);
+            $id = $connection->lastInsertId();
+            $sql = "UPDATE c_item_property SET id = iid WHERE iid = $id";
+            $connection->executeQuery($sql);
         }
     }
     error_log('End - Fix work documents');
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index 3cd3844616..97da286e28 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -5,6 +5,7 @@ use Chamilo\CoreBundle\Repository\CourseRepository;
 use Chamilo\CourseBundle\Component\CourseCopy\CourseArchiver;
 use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
 use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;
+use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Entity\CItemProperty;
 use Chamilo\CourseBundle\Entity\CLp;
 use Chamilo\CourseBundle\Entity\CLpCategory;
@@ -3671,7 +3672,6 @@ class learnpath
                             }
 
                             $type_quiz = false;
-
                             foreach ($list as $toc) {
                                 if ($toc['id'] == $lp_item_id && ($toc['type'] == 'quiz')) {
                                     $type_quiz = true;
@@ -3705,7 +3705,6 @@ class learnpath
                     if (strpos($document_name, '_DELETED_')) {
                         $file = 'blank.php?error=document_deleted';
                     }
-
                     break;
                 case 2:
                     if ($this->debug > 2) {
@@ -6259,10 +6258,14 @@ class learnpath
             if (file_exists($iconPath.'lp_'.$icon_name.'.png')) {
                 $icon = Display::return_icon('lp_'.$icon_name.'.png');
             } else {
-                if ($arrLP[$i]['item_type'] === TOOL_LP_FINAL_ITEM) {
-                    $icon = Display::return_icon('certificate.png');
+                if (file_exists($iconPath.'lp_'.$icon_name.'.gif')) {
+                    $icon = Display::return_icon('lp_'.$icon_name.'.gif');
                 } else {
-                    $icon = Display::return_icon('folder_document.png');
+                    if ($arrLP[$i]['item_type'] === TOOL_LP_FINAL_ITEM) {
+                        $icon = Display::return_icon('certificate.png');
+                    } else {
+                        $icon = Display::return_icon('folder_document.png');
+                    }
                 }
             }
 
@@ -10216,8 +10219,10 @@ class learnpath
     public function display_item_prerequisites_form($item_id = 0)
     {
         $course_id = api_get_course_int_id();
+        $item_id = (int) $item_id;
+
         $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
-        $item_id = intval($item_id);
+
         /* Current prerequisite */
         $sql = "SELECT * FROM $tbl_lp_item
                 WHERE iid = $item_id";
@@ -12513,7 +12518,7 @@ EOD;
             $link = 'lp/lp_controller.php?cidReq='.$courseInfo['code'].'&id_session='.$sessionId.'&gidReq=0&gradebook=0&origin=&action=view_category&id='.$id;
             // Delete tools
             $sql = "DELETE FROM $tbl_tool
-                    WHERE c_id = ".$courseId." AND (link LIKE '$link%' AND image LIKE 'lp_category.%')";
+                    WHERE c_id = ".$courseId." AND (link LIKE '$link%' AND image='lp_category.gif')";
             Database::query($sql);
         }
     }
diff --git a/main/lp/learnpathItem.class.php b/main/lp/learnpathItem.class.php
index b4de330f80..c274a1abf3 100755
--- a/main/lp/learnpathItem.class.php
+++ b/main/lp/learnpathItem.class.php
@@ -2495,8 +2495,18 @@ class learnpathItem
                                                         LIMIT 0, 1';
                                                 $rs_quiz = Database::query($sql);
                                                 if ($quiz = Database::fetch_array($rs_quiz)) {
-                                                    $minScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMinScore();
-                                                    $maxScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMaxScore();
+                                                    /** @var learnpathItem $myItemToCheck */
+                                                    $myItemToCheck = $items[$refs_list[$this->get_id()]];
+                                                    $minScore = $myItemToCheck->getPrerequisiteMinScore();
+                                                    $maxScore = $myItemToCheck->getPrerequisiteMaxScore();
+
+                                                    if (empty($minScore)) {
+                                                        // Try with mastery_score
+                                                        $masteryScoreAsMin = $myItemToCheck->get_mastery_score();
+                                                        if (!empty($masteryScoreAsMin)) {
+                                                            $minScore = $masteryScoreAsMin;
+                                                        }
+                                                    }
 
                                                     if (isset($minScore) && isset($minScore)) {
                                                         // Taking min/max prerequisites values see BT#5776
@@ -2547,8 +2557,18 @@ class learnpathItem
                                             $rs_quiz = Database::query($sql);
                                             if (Database::num_rows($rs_quiz) > 0) {
                                                 while ($quiz = Database::fetch_array($rs_quiz)) {
-                                                    $minScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMinScore();
-                                                    $maxScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMaxScore();
+                                                    /** @var learnpathItem $myItemToCheck */
+                                                    $myItemToCheck = $items[$refs_list[$this->get_id()]];
+                                                    $minScore = $myItemToCheck->getPrerequisiteMinScore();
+                                                    $maxScore = $myItemToCheck->getPrerequisiteMaxScore();
+
+                                                    if (empty($minScore)) {
+                                                        // Try with mastery_score
+                                                        $masteryScoreAsMin = $myItemToCheck->get_mastery_score();
+                                                        if (!empty($masteryScoreAsMin)) {
+                                                            $minScore = $masteryScoreAsMin;
+                                                        }
+                                                    }
 
                                                     if (isset($minScore) && isset($minScore)) {
                                                         // Taking min/max prerequisites values see BT#5776
diff --git a/main/lp/lp_add_item.php b/main/lp/lp_add_item.php
index db54d1983b..1424e46097 100755
--- a/main/lp/lp_add_item.php
+++ b/main/lp/lp_add_item.php
@@ -24,7 +24,6 @@ $lpId = isset($_REQUEST['lp_id']) ? (int) $_REQUEST['lp_id'] : 0;
 $submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
 $type = isset($_GET['type']) ? $_GET['type'] : null;
 $action = isset($_GET['action']) ? $_GET['action'] : null;
-
 $is_allowed_to_edit = api_is_allowed_to_edit(null, false);
 
 $listUrl = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=view&lp_id='.$lpId.'&'.api_get_cidreq().'&isStudentView=true';
diff --git a/main/lp/scorm_api.php b/main/lp/scorm_api.php
index e0c2d57f6e..f5dc2c06ae 100755
--- a/main/lp/scorm_api.php
+++ b/main/lp/scorm_api.php
@@ -1692,6 +1692,8 @@ function switch_item(current_item, next_item) {
             if ($("#lp_media_file").length != 0) {
                 $("#lp_media_file").html(tmp_data);
             }
+
+            LPViewUtils.setHeightLPToc();
         }
     });
 
diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index 01623f83c5..6662432948 100755
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -26,7 +26,6 @@ if (isset($_GET['messages_page_nr'])) {
 
 $nameTools = get_lang('Messages');
 $show_message = null;
-
 if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
     $info_reply = [];
     $info_delete = [];
@@ -112,7 +111,7 @@ $keyword = '';
 // Comes from normal profile
 if ($allowMessage) {
     $actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
-        Display::return_icon('new-message.png', get_lang('ComposeMessage'),null,ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null, ICON_SIZE_MEDIUM).'</a>';
     $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
         Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM).'</a>';
     $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
@@ -174,4 +173,3 @@ $content = $tpl->fetch($social_layout);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
-
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index c982927ee5..f61a8c25cb 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -343,10 +343,9 @@ $message_content = null;
 $actions = null;
 if ($group_id != 0) {
     $actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
-        Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage')),null, ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage')), null, ICON_SIZE_MEDIUM).'</a>';
     $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
         Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('ComposeMessage')), null, ICON_SIZE_MEDIUM).'</a>';
-
 } else {
     $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
         Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM).'</a>';
@@ -419,4 +418,3 @@ $social_layout = $tpl->get_template('message/inbox.tpl');
 $content = $tpl->fetch($social_layout);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
-
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index a50a0f256d..dae4584115 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -42,16 +42,16 @@ $interbreadcrumb[] = [
 
 $actions = null;
 if ($allowMessage) {
-    $actionsLeft = '<a href="' . api_get_path(WEB_PATH) . 'main/messages/inbox.php">' .
-        Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM) . '</a>';
-    $actionsLeft .= '<a href="' . api_get_path(WEB_PATH) . 'main/messages/new_message.php">' .
-        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null, ICON_SIZE_MEDIUM) . '</a>';
-    $actionsLeft .= '<a href="' . api_get_path(WEB_PATH) . 'main/messages/inbox.php">' .
-        Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM) . '</a>';
-    $actionsLeft .= '<a href="' . api_get_path(WEB_PATH) . 'main/messages/outbox.php">' .
-        Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM) . '</a>';
-
-    $form = MessageManager::getSearchForm(api_get_path(WEB_PATH) . 'main/messages/outbox.php');
+    $actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+        Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
+        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+        Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
+        Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM).'</a>';
+
+    $form = MessageManager::getSearchForm(api_get_path(WEB_PATH).'main/messages/outbox.php');
     if ($form->validate()) {
         $values = $form->getSubmitValues();
         $keyword = $values['keyword'];
@@ -68,7 +68,6 @@ if (isset($_REQUEST['action'])) {
 $keyword = '';
 $message_content = null;
 
-
 $actions .= Display::toolbarAction(
     'toolbar',
     [$actionsLeft, $actionsRight]
@@ -117,4 +116,3 @@ $content = $tpl->fetch($social_layout);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
-
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index 8e93befc64..d61b95d63d 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -28,14 +28,13 @@ $actions = null;
 
 if (api_get_setting('allow_message_tool') === 'true') {
     $actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
-        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null,ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null, ICON_SIZE_MEDIUM).'</a>';
     $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
         Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM).'</a>';
     $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
         Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM).'</a>';
 }
 
-
 $actions .= Display::toolbarAction(
     'toolbar',
     [$actionsLeft]
@@ -51,7 +50,6 @@ if (empty($_GET['id'])) {
     $show_menu = 'messages_inbox';
 }
 
-
 // MAIN CONTENT
 $message_content = MessageManager::showMessageBox($messageId, $source);
 
@@ -73,4 +71,3 @@ $social_layout = $tpl->get_template('message/inbox.tpl');
 $content = $tpl->fetch($social_layout);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
-
diff --git a/main/mySpace/exercise_category_report.php b/main/mySpace/exercise_category_report.php
index 9d7aeaf0cc..4447fb787b 100644
--- a/main/mySpace/exercise_category_report.php
+++ b/main/mySpace/exercise_category_report.php
@@ -94,7 +94,11 @@ if ($form->validate() && !empty($courseInfo)) {
     $exerciseId = isset($values['exercise_id']) ? $values['exercise_id'] : 0;
     $startDate = Security::remove_XSS($values['start_date']);
     $exportFilename = 'exercise_results_report_'.$exerciseId.'_'.$courseInfo['code'];
-    $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_results_report&exercise_id='.$exerciseId.'&start_date='.$startDate.'&cidReq='.$courseInfo['code'].'&export_filename='.$exportFilename;
+    $url = api_get_path(WEB_AJAX_PATH).
+        'model.ajax.php?a=get_exercise_results_report&exercise_id='.$exerciseId.
+        '&start_date='.$startDate.'&cidReq='.$courseInfo['code'].
+        '&course_id='.$courseId.
+        '&export_filename='.$exportFilename;
 
     $categoryList = TestCategory::getListOfCategoriesIDForTest($exerciseId, $courseId);
     $columns = [
diff --git a/main/mySpace/lp_tracking.php b/main/mySpace/lp_tracking.php
index 92f34ae1f7..603483eda5 100755
--- a/main/mySpace/lp_tracking.php
+++ b/main/mySpace/lp_tracking.php
@@ -90,7 +90,7 @@ $actions[] = Display::url(
 );
 $actions[] = Display::url(
     Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM),
-    'window.print();'
+    'javascript:window.print();'
 );
 $actions[] = Display::url(
     Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM),
diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index a7794124b2..67d69f391a 100644
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -51,7 +51,6 @@ if (api_get_setting('allow_terms_conditions') === 'true') {
     $formDelete->addButtonDelete(get_lang('DeleteAccount'));
     $formToString .= $formDelete->returnForm();
 }
-
 switch ($action) {
     case 'send_legal':
         $language = api_get_interface_language();
diff --git a/main/survey/create_meeting.php b/main/survey/create_meeting.php
index 560dccaf87..67abea512d 100644
--- a/main/survey/create_meeting.php
+++ b/main/survey/create_meeting.php
@@ -68,7 +68,7 @@ $hideList = '';
 $maxEvents = 20;
 for ($i = 1; $i <= $maxEvents; $i++) {
     $name = 'time_'.$i;
-    $form->addDateTimeRangePicker($name, get_lang('Time'));
+    $form->addDateTimeRangePicker($name, get_lang('Date'));
     if ($i > 3) {
         $hideList .= "$('#".$name."_alt').parent().parent().parent().hide();";
     }
diff --git a/main/survey/reporting.php b/main/survey/reporting.php
index 4cf1c841d7..2c9585121e 100755
--- a/main/survey/reporting.php
+++ b/main/survey/reporting.php
@@ -76,7 +76,6 @@ if (!empty($exportReport) && !empty($format)) {
                 $userId
             );
             $filename = 'survey_results_'.$survey_id.'.csv';
-
             header('Content-type: application/octet-stream');
             header('Content-Type: application/force-download');
 
diff --git a/main/survey/surveyUtil.class.php b/main/survey/surveyUtil.class.php
index 16afe212ff..bcca0a3196 100755
--- a/main/survey/surveyUtil.class.php
+++ b/main/survey/surveyUtil.class.php
@@ -107,7 +107,6 @@ class SurveyUtil
         if (empty($question_id)) {
             return false;
         }
-
         // Table definition
         $table_survey_answer = Database::get_course_table(TABLE_SURVEY_ANSWER);
 
@@ -1554,8 +1553,12 @@ class SurveyUtil
                     count(options.question_option_id) as number_of_options
 				FROM $table_survey_question questions
 				LEFT JOIN $table_survey_question_option options
-                ON questions.question_id = options.question_id AND options.c_id = questions.c_id
+                ON 
+                  questions.question_id = options.question_id AND 
+                  options.c_id = questions.c_id
 				WHERE
+				    survey_question NOT LIKE '%{{%' AND
+				    questions.type <> 'pagebreak' AND
 				    questions.survey_id = $surveyId AND
 				    questions.c_id = $course_id
 				GROUP BY questions.question_id
@@ -1620,6 +1623,8 @@ class SurveyUtil
 				    survey_question.question_id = survey_question_option.question_id AND 
 				    survey_question_option.c_id = survey_question.c_id
 				WHERE 
+				    survey_question NOT LIKE '%{{%' AND
+				    survey_question.type <> 'pagebreak' AND
 				    survey_question.survey_id = $surveyId AND
 				    survey_question.c_id = $course_id
 				ORDER BY survey_question.sort ASC, survey_question_option.sort ASC";
diff --git a/main/work/add_document.php b/main/work/add_document.php
index e8f7443480..98d869403d 100755
--- a/main/work/add_document.php
+++ b/main/work/add_document.php
@@ -60,11 +60,12 @@ if (empty($docId)) {
     if (!empty($documents)) {
         echo Display::page_subheader(get_lang('DocumentsAdded'));
         echo '<div class="well">';
+        $urlDocument = api_get_path(WEB_CODE_PATH).'work/add_document.php';
         foreach ($documents as $doc) {
             $documentId = $doc['document_id'];
             $docData = DocumentManager::get_document_data_by_id($documentId, $courseInfo['code']);
             if ($docData) {
-                $url = api_get_path(WEB_CODE_PATH).'work/add_document.php?action=delete&id='.$workId.'&document_id='.$documentId.'&'.api_get_cidreq();
+                $url = $urlDocument.'?action=delete&id='.$workId.'&document_id='.$documentId.'&'.api_get_cidreq();
                 $link = Display::url(get_lang('Remove'), $url, ['class' => 'btn btn-danger']);
                 echo $docData['title'].' '.$link.'<br />';
             }
@@ -74,12 +75,16 @@ if (empty($docId)) {
 
     $documentTree = DocumentManager::get_document_preview(
         $courseInfo,
-        null,
+        false,
         null,
         api_get_session_id(),
         false,
         '/',
-        api_get_path(WEB_CODE_PATH).'work/add_document.php?id='.$workId.'&'.api_get_cidreq()
+        api_get_path(WEB_CODE_PATH).'work/add_document.php?id='.$workId.'&'.api_get_cidreq(),
+        false,
+        false,
+        false,
+        false
     );
     echo Display::page_subheader(get_lang('Documents'));
     echo $documentTree;
diff --git a/plugin/customcertificate/config.php b/plugin/customcertificate/config.php
index 4177cc3257..c27e283637 100644
--- a/plugin/customcertificate/config.php
+++ b/plugin/customcertificate/config.php
@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Config the plugin.
  *
diff --git a/plugin/customcertificate/src/CustomCertificatePlugin.php b/plugin/customcertificate/src/CustomCertificatePlugin.php
index 8c156a46c7..63d5050306 100644
--- a/plugin/customcertificate/src/CustomCertificatePlugin.php
+++ b/plugin/customcertificate/src/CustomCertificatePlugin.php
@@ -259,7 +259,6 @@ class CustomCertificatePlugin extends Plugin
 
         if (api_get_plugin_setting('customcertificate', 'enable_plugin_customcertificate') === 'true') {
             $infoCertificate = self::getCertificateData($certId, $userId);
-            var_dump($infoCertificate);
             if (!empty($infoCertificate)) {
                 if ($certificate->user_id == api_get_user_id() && !empty($certificate->certificate_data)) {
                     $certificateId = $certificate->certificate_data['id'];
diff --git a/plugin/customcertificate/src/index.php b/plugin/customcertificate/src/index.php
index f68a8bec93..3c2f337d11 100644
--- a/plugin/customcertificate/src/index.php
+++ b/plugin/customcertificate/src/index.php
@@ -1,7 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-if (intval($_GET['default']) == 1) {
+$isDefault = isset($_GET['default']) ? (int) $_GET['default'] : null;
+
+if ($isDefault === 1) {
     $cidReset = true;
 }
 
@@ -17,7 +19,7 @@ $enable = $plugin->get('enable_plugin_customcertificate') == 'true';
 $accessUrlId = api_get_current_access_url_id();
 $course_info = api_get_course_info();
 
-if (intval($_GET['default']) == 1) {
+if ($isDefault === 1) {
     $courseId = 0;
     $courseCode = '';
     $sessionId = 0;
@@ -72,15 +74,6 @@ $infoCertificate = Database::select(
     ],
     'first'
 );
-if (!is_array($infoCertificate)) {
-    $infoCertificate = [
-        'type_date_expediction' => '',
-        'year' => '',
-        'month' => '',
-        'day' => '',
-        'date_change' => '',
-    ];
-}
 
 $form = new FormValidator(
     'formEdit',
@@ -106,13 +99,13 @@ if ($form->validate()) {
             'c_id' => $formValues['c_id'],
             'session_id' => $formValues['session_id'],
             'content_course' => $formValues['content_course'],
-            'contents_type' => intval($formValues['contents_type']),
+            'contents_type' => (int) $formValues['contents_type'],
             'contents' => $contents,
             'date_change' => intval($formValues['date_change']),
             'date_start' => date("Y-m-d", strtotime($date_start)),
             'date_end' => date("Y-m-d", strtotime($date_end)),
             'place' => $formValues['place'],
-            'type_date_expediction' => intval($formValues['type_date_expediction']),
+            'type_date_expediction' => (int) $formValues['type_date_expediction'],
             'day' => $formValues['day'],
             'month' => $formValues['month'],
             'year' => $formValues['year'],
@@ -120,8 +113,8 @@ if ($form->validate()) {
             'signature_text2' => $formValues['signature_text2'],
             'signature_text3' => $formValues['signature_text3'],
             'signature_text4' => $formValues['signature_text4'],
-            'margin_left' => intval($formValues['margin_left']),
-            'margin_right' => intval($formValues['margin_right']),
+            'margin_left' => (int) $formValues['margin_left'],
+            'margin_right' => (int) $formValues['margin_right'],
             'certificate_default' => 0,
         ];
 
@@ -215,7 +208,13 @@ if (empty($infoCertificate)) {
     );
 
     if (!is_array($infoCertificate)) {
-        $infoCertificate = [];
+        $infoCertificate = [
+            'type_date_expediction' => '',
+            'year' => '',
+            'month' => '',
+            'day' => '',
+            'date_change' => '',
+        ];
     }
     if (!empty($infoCertificate)) {
         $useDefault = true;
@@ -245,7 +244,7 @@ $dir = '/';
 $courseInfo = api_get_course_info();
 $isAllowedToEdit = api_is_allowed_to_edit(null, true);
 $editorConfig = [
-    'ToolbarSet' => ($isAllowedToEdit ? 'Documents' : 'DocumentsStudent'),
+    'ToolbarSet' => $isAllowedToEdit ? 'Documents' : 'DocumentsStudent',
     'Width' => '100%',
     'Height' => '300',
     'cols-size' => [0, 12, 0],
diff --git a/plugin/customcertificate/src/print_certificate.php b/plugin/customcertificate/src/print_certificate.php
index be11016b22..2fae2706b3 100644
--- a/plugin/customcertificate/src/print_certificate.php
+++ b/plugin/customcertificate/src/print_certificate.php
@@ -5,7 +5,7 @@ use Chamilo\CourseBundle\Entity\CLpCategory;
 
 $default = isset($_GET['default']) ? (int) $_GET['default'] : null;
 
-if ($default == 1) {
+if ($default === 1) {
     $cidReset = true;
 }
 
@@ -41,6 +41,8 @@ if (empty($courseCode)) {
     if (!empty($courseInfo)) {
         $courseId = $courseInfo['real_id'];
     }
+} else {
+    $courseInfo = api_get_course_info($courseCode);
 }
 
 if (empty($sessionId)) {
@@ -116,17 +118,21 @@ if (empty($infoCertificate)) {
 
 $workSpace = intval(297 - $infoCertificate['margin_left'] - $infoCertificate['margin_right']);
 $widthCell = intval($workSpace / 6);
-$htmlText = '<html>';
-$htmlText .= '
+$htmlList = [];
+
+$currentLocalTime = api_get_local_time();
+
+foreach ($userList as $userInfo) {
+    $htmlText = '<html>';
+    $htmlText .= '
     <link rel="stylesheet"
         type="text/css"
         href="'.api_get_path(WEB_PLUGIN_PATH).'customcertificate/resources/css/certificate.css">';
-$htmlText .= '
+    $htmlText .= '
     <link rel="stylesheet"
         type="text/css"
         href="'.api_get_path(WEB_CSS_PATH).'document.css">';
-$htmlText .= '<body>';
-foreach ($userList as $userInfo) {
+    $htmlText .= '<body>';
     $studentId = $userInfo['user_id'];
 
     if (empty($infoCertificate['background'])) {
@@ -248,8 +254,10 @@ foreach ($userList as $userInfo) {
                 );
             }
         } else {
-            $dateInfo = api_get_local_time($sessionInfo['access_end_date']);
-            $dateExpediction .= $plugin->get_lang('to').api_format_date($dateInfo, DATE_FORMAT_LONG);
+            if (!empty($sessionInfo)) {
+                $dateInfo = api_get_local_time($sessionInfo['access_end_date']);
+                $dateExpediction .= $plugin->get_lang('to').api_format_date($dateInfo, DATE_FORMAT_LONG);
+            }
         }
     }
 
@@ -284,52 +292,52 @@ foreach ($userList as $userInfo) {
 
     $htmlText .= '<tr>';
     $htmlText .= '<td colspan="2" class="seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature_text1'])) ? $infoCertificate['signature_text1'] : '').
-        '</td>
+                ((!empty($infoCertificate['signature_text1'])) ? $infoCertificate['signature_text1'] : '').
+                '</td>
                 <td colspan="2" class="seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature_text2'])) ? $infoCertificate['signature_text2'] : '').
-        '</td>
+                ((!empty($infoCertificate['signature_text2'])) ? $infoCertificate['signature_text2'] : '').
+                '</td>
                 <td colspan="2" class="seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature_text3'])) ? $infoCertificate['signature_text3'] : '').
-        '</td>
+                ((!empty($infoCertificate['signature_text3'])) ? $infoCertificate['signature_text3'] : '').
+                '</td>
                 <td colspan="2" class="seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature_text4'])) ? $infoCertificate['signature_text4'] : '').
-        '</td>
+                ((!empty($infoCertificate['signature_text4'])) ? $infoCertificate['signature_text4'] : '').
+                '</td>
                 <td colspan="4" class="seals" style="width:'.(2 * $widthCell).'mm">
                     '.((!empty($infoCertificate['seal'])) ? $plugin->get_lang('Seal') : '').
-        '</td>';
+                '</td>';
     $htmlText .= '</tr>';
     $htmlText .= '<tr>';
     $htmlText .= '<td colspan="2" class="logo-seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature1']))
-            ? '<img style="max-height: 100px; max-width: '.$widthCell.'mm;"
+                ((!empty($infoCertificate['signature1']))
+                ? '<img style="max-height: 100px; max-width: '.$widthCell.'mm;"
                     src="'.$path.$infoCertificate['signature1'].'" />'
-            : '').
-        '</td>
+                : '').
+                '</td>
                 <td colspan="2" class="logo-seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature2']))
-            ? '<img style="max-height: 100px; '.$widthCell.'mm;"
+                ((!empty($infoCertificate['signature2']))
+                ? '<img style="max-height: 100px; '.$widthCell.'mm;"
                     src="'.$path.$infoCertificate['signature2'].'" />'
-            : '').
-        '</td>
+                : '').
+                '</td>
                 <td colspan="2" class="logo-seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature3']))
-            ? '<img style="max-height: 100px; '.$widthCell.'mm;"
+                ((!empty($infoCertificate['signature3']))
+                ? '<img style="max-height: 100px; '.$widthCell.'mm;"
                     src="'.$path.$infoCertificate['signature3'].'" />'
-            : '').
-        '</td>
+                : '').
+                '</td>
                 <td colspan="2" class="logo-seals" style="width:'.$widthCell.'mm">'.
-        ((!empty($infoCertificate['signature4']))
-            ? '<img style="max-height: 100px; '.$widthCell.'mm;"
+                ((!empty($infoCertificate['signature4']))
+                ? '<img style="max-height: 100px; '.$widthCell.'mm;"
                     src="'.$path.$infoCertificate['signature4'].'" />'
-            : '').
-        '</td>
+                : '').
+                '</td>
                 <td colspan="4" class="logo-seals" style="width:'.(2 * $widthCell).'mm">'.
-        ((!empty($infoCertificate['seal']))
-            ? '<img style="max-height: 100px; '.(2 * $widthCell).'mm;"
+                ((!empty($infoCertificate['seal']))
+                ? '<img style="max-height: 100px; '.(2 * $widthCell).'mm;"
                     src="'.$path.$infoCertificate['seal'].'" />'
-            : '').
-        '</td>';
+                : '').
+                '</td>';
     $htmlText .= '</tr>';
     $htmlText .= '</table>';
     $htmlText .= '</div>';
@@ -465,24 +473,50 @@ foreach ($userList as $userInfo) {
         }
         $htmlText .= '</div>';
     }
+    $htmlText .= '</body></html>';
+    $fileName = 'certificate_'.$courseInfo['code'].'_'.$userInfo['complete_name'].'_'.$currentLocalTime;
+    $htmlList[$fileName] = $htmlText;
+}
+
+$fileList = [];
+$archivePath = api_get_path(SYS_ARCHIVE_PATH).'certificates/';
+if (!is_dir($archivePath)) {
+    mkdir($archivePath, api_get_permissions_for_new_directories());
+}
+
+foreach ($htmlList as $fileName => $content) {
+    $fileName = api_replace_dangerous_char($fileName);
+    $params = [
+        'filename' => $fileName,
+        'pdf_title' => 'Certificate',
+        'pdf_description' => '',
+        'format' => 'A4-L',
+        'orientation' => 'L',
+        'left' => 15,
+        'top' => 15,
+        'bottom' => 0,
+    ];
+    $pdf = new PDF($params['format'], $params['orientation'], $params);
+    if (count($htmlList) == 1) {
+        $pdf->content_to_pdf($content, '', $fileName, null, 'D', false, null, false, false, false);
+        exit;
+    } else {
+        $filePath = $archivePath.$fileName.'.pdf';
+        $pdf->content_to_pdf($content, '', $fileName, null, 'F', true, $filePath, false, false, false);
+        $fileList[] = $filePath;
+    }
+}
+
+if (!empty($fileList)) {
+    $zipFile = $archivePath.'certificates_'.api_get_unique_id().'.zip';
+    $zipFolder = new PclZip($zipFile);
+    foreach ($fileList as $file) {
+        $zipFolder->add($file, PCLZIP_OPT_REMOVE_ALL_PATH);
+    }
+    $name = 'certificates_'.$courseInfo['code'].'_'.$currentLocalTime.'.zip';
+    DocumentManager::file_send_for_download($zipFile, true, $name);
+    exit;
 }
-$htmlText .= '</body></html>';
-
-$fileName = 'certificate_'.date('Ymd_His');
-$params = [
-    'filename' => $fileName,
-    'pdf_title' => 'Certificate',
-    'pdf_description' => '',
-    'format' => 'A4-L',
-    'orientation' => 'L',
-    'left' => 15,
-    'top' => 15,
-    'bottom' => 0,
-];
-
-$pdf = new PDF($params['format'], $params['orientation'], $params);
-$pdf->content_to_pdf($htmlText, '', $fileName, null, 'D', false, null, false, false, false);
-exit;
 
 function getIndexFiltered($index)
 {
@@ -491,12 +525,16 @@ function getIndexFiltered($index)
     $lines = explode(chr(13).chr(10), $txt);
     $text1 = '';
     for ($x = 0; $x < 47; $x++) {
-        $text1 .= $lines[$x].chr(13).chr(10);
+        if (isset($lines[$x])) {
+            $text1 .= $lines[$x].chr(13).chr(10);
+        }
     }
 
     $text2 = '';
     for ($x = 47; $x < 94; $x++) {
-        $text2 .= $lines[$x].chr(13).chr(10);
+        if (isset($lines[$x])) {
+            $text2 .= $lines[$x].chr(13).chr(10);
+        }
     }
 
     $showLeft = str_replace(chr(13).chr(10), "<br/>", $text1);
diff --git a/plugin/notebookteacher/src/NotebookTeacherPlugin.php b/plugin/notebookteacher/src/NotebookTeacherPlugin.php
index 3908383a1c..c54baf61f8 100644
--- a/plugin/notebookteacher/src/NotebookTeacherPlugin.php
+++ b/plugin/notebookteacher/src/NotebookTeacherPlugin.php
@@ -58,18 +58,23 @@ class NotebookTeacherPlugin extends Plugin
             return false;
         }
 
-        $srcfile1 = __DIR__.'/../resources/img/64/notebookteacher.png';
-        $srcfile2 = __DIR__.'/../resources/img/64/notebookteacher_na.png';
-        $srcfile3 = __DIR__.'/../resources/img/32/notebookteacher.png';
-        $srcfile4 = __DIR__.'/../resources/img/22/notebookteacher.png';
-        $dstfile1 = __DIR__.'/../../../main/img/icons/64/notebookteacher.png';
-        $dstfile2 = __DIR__.'/../../../main/img/icons/64/notebookteacher_na.png';
-        $dstfile3 = __DIR__.'/../../../main/img/icons/32/notebookteacher.png';
-        $dstfile4 = __DIR__.'/../../../main/img/notebookteacher.png';
-        copy($srcfile1, $dstfile1);
-        copy($srcfile2, $dstfile2);
-        copy($srcfile3, $dstfile3);
-        copy($srcfile4, $dstfile4);
+        $list = [
+            '/64/notebookteacher.png',
+            '/64/notebookteacher_na.png',
+            '/32/notebookteacher.png',
+            '/32/notebookteacher_na.png',
+            '/32/test2pdf_na.png',
+            '/22/notebookteacher.png',
+        ];
+
+        foreach ($list as $file) {
+            $source = __DIR__.'/../resources/img/'.$file;
+            $destination = __DIR__.'/../../../main/img/icons/'.$file;
+            $res = @copy($source, $destination);
+            if (!$res) {
+                break;
+            }
+        }
 
         require_once api_get_path(SYS_PLUGIN_PATH).'notebookteacher/database.php';
     }
diff --git a/plugin/sepe/src/sepe_plugin.class.php b/plugin/sepe/src/sepe_plugin.class.php
index f254b01101..d019cd1cb0 100644
--- a/plugin/sepe/src/sepe_plugin.class.php
+++ b/plugin/sepe/src/sepe_plugin.class.php
@@ -80,7 +80,7 @@ class SepePlugin extends Plugin
         $sm = $cn->getSchemaManager();
         $tables = $sm->tablesExist($tablesToBeCompared);
 
-        if ($tables) {
+        if (empty($tables)) {
             return false;
         }
 
diff --git a/plugin/test2pdf/src/test2pdf_plugin.class.php b/plugin/test2pdf/src/test2pdf_plugin.class.php
index d31345ea3f..e56a4589fb 100644
--- a/plugin/test2pdf/src/test2pdf_plugin.class.php
+++ b/plugin/test2pdf/src/test2pdf_plugin.class.php
@@ -39,19 +39,28 @@ class Test2pdfPlugin extends Plugin
         //Installing course settings
         $this->install_course_fields_in_all_courses();
 
-        $srcfile1 = __DIR__.'/../resources/img/64/test2pdf.png';
-        $srcfile2 = __DIR__.'/../resources/img/64/test2pdf_na.png';
-        $srcfile3 = __DIR__.'/../resources/img/22/test2pdf.png';
-        $dstfile1 = __DIR__.'/../../../main/img/icons/64/test2pdf.png';
-        $dstfile2 = __DIR__.'/../../../main/img/icons/64/test2pdf_na.png';
-        $dstfile3 = __DIR__.'/../../../main/img/test2pdf.png';
-        $res1 = @copy($srcfile1, $dstfile1);
-        $res2 = @copy($srcfile2, $dstfile2);
-        $res3 = @copy($srcfile3, $dstfile3);
-        if (!$res1 || !$res2 || !$res3) {
-            $warning = 'Test2PDF plugin icons could not be copied to main/img/ because of folder permissions. To fix, give web server user permissions to write to main/img/ before enabling this plugin.';
-            Display::addFlash($warning);
-            error_log($warning);
+        $list = [
+            '/64/test2pdf.png',
+            '/64/test2pdf_na.png',
+            '/32/test2pdf.png',
+            '/32/test2pdf_na.png',
+            '/22/test2pdf.png',
+        ];
+
+        $res = true;
+        foreach ($list as $file) {
+            $source = __DIR__.'/../resources/img/'.$file;
+            $destination = __DIR__.'/../../../main/img/icons/'.$file;
+            $res = @copy($source, $destination);
+            if (!$res) {
+                break;
+            }
+        }
+
+        if (!$res) {
+            $warning = 'Test2PDF plugin icons could not be copied to main/img/ because of folder permissions. 
+            To fix, give web server user permissions to write to main/img/ before enabling this plugin.';
+            Display::addFlash(Display::return_message($warning, 'warning'));
         }
     }
 
diff --git a/public/img/icons/128/add_doodle.png b/public/img/icons/128/add_doodle.png
new file mode 100644
index 0000000000..87523dbabd
Binary files /dev/null and b/public/img/icons/128/add_doodle.png differ
diff --git a/public/img/icons/128/external_link.png b/public/img/icons/128/external_link.png
new file mode 100644
index 0000000000..d4226d3b1f
Binary files /dev/null and b/public/img/icons/128/external_link.png differ
diff --git a/public/img/icons/128/multiplicate_survey.png b/public/img/icons/128/multiplicate_survey.png
new file mode 100644
index 0000000000..6ae7c1f01d
Binary files /dev/null and b/public/img/icons/128/multiplicate_survey.png differ
diff --git a/public/img/icons/128/multiplicate_survey_na.png b/public/img/icons/128/multiplicate_survey_na.png
new file mode 100644
index 0000000000..a55b99ca38
Binary files /dev/null and b/public/img/icons/128/multiplicate_survey_na.png differ
diff --git a/public/img/icons/128/statistics_na.png b/public/img/icons/128/statistics_na.png
new file mode 100644
index 0000000000..a063068dc5
Binary files /dev/null and b/public/img/icons/128/statistics_na.png differ
diff --git a/public/img/icons/16/external_link.png b/public/img/icons/16/external_link.png
new file mode 100644
index 0000000000..1c8b3e40db
Binary files /dev/null and b/public/img/icons/16/external_link.png differ
diff --git a/public/img/icons/16/statistics_na.png b/public/img/icons/16/statistics_na.png
index e4e3c69151..afe6fdd68f 100644
Binary files a/public/img/icons/16/statistics_na.png and b/public/img/icons/16/statistics_na.png differ
diff --git a/public/img/icons/22/add_doodle.png b/public/img/icons/22/add_doodle.png
new file mode 100644
index 0000000000..1d7886605a
Binary files /dev/null and b/public/img/icons/22/add_doodle.png differ
diff --git a/public/img/icons/22/external_link.png b/public/img/icons/22/external_link.png
new file mode 100644
index 0000000000..fa13f2eed1
Binary files /dev/null and b/public/img/icons/22/external_link.png differ
diff --git a/public/img/icons/22/multiplicate_survey.png b/public/img/icons/22/multiplicate_survey.png
new file mode 100644
index 0000000000..2888d2558d
Binary files /dev/null and b/public/img/icons/22/multiplicate_survey.png differ
diff --git a/public/img/icons/22/multiplicate_survey_na.png b/public/img/icons/22/multiplicate_survey_na.png
new file mode 100644
index 0000000000..d7dc82464d
Binary files /dev/null and b/public/img/icons/22/multiplicate_survey_na.png differ
diff --git a/public/img/icons/22/scormbuilder.png b/public/img/icons/22/scormbuilder.png
new file mode 100644
index 0000000000..daf558626e
Binary files /dev/null and b/public/img/icons/22/scormbuilder.png differ
diff --git a/public/img/icons/22/statistics_na.png b/public/img/icons/22/statistics_na.png
new file mode 100644
index 0000000000..61efbfc2ae
Binary files /dev/null and b/public/img/icons/22/statistics_na.png differ
diff --git a/public/img/icons/22/test2pdf.png b/public/img/icons/22/test2pdf.png
new file mode 100644
index 0000000000..dab8f27376
Binary files /dev/null and b/public/img/icons/22/test2pdf.png differ
diff --git a/public/img/icons/22/warning.png b/public/img/icons/22/warning.png
index b552183ef7..5c328432cc 100644
Binary files a/public/img/icons/22/warning.png and b/public/img/icons/22/warning.png differ
diff --git a/public/img/icons/32/add_doodle.png b/public/img/icons/32/add_doodle.png
new file mode 100644
index 0000000000..eaeae4addb
Binary files /dev/null and b/public/img/icons/32/add_doodle.png differ
diff --git a/public/img/icons/32/agenda_na.png b/public/img/icons/32/agenda_na.png
new file mode 100644
index 0000000000..933280087a
Binary files /dev/null and b/public/img/icons/32/agenda_na.png differ
diff --git a/public/img/icons/32/attendance_na.png b/public/img/icons/32/attendance_na.png
new file mode 100644
index 0000000000..3ff8913609
Binary files /dev/null and b/public/img/icons/32/attendance_na.png differ
diff --git a/public/img/icons/32/backup.png b/public/img/icons/32/backup.png
new file mode 100644
index 0000000000..b43ca081ed
Binary files /dev/null and b/public/img/icons/32/backup.png differ
diff --git a/public/img/icons/32/blog_admin.png b/public/img/icons/32/blog_admin.png
new file mode 100644
index 0000000000..c2e9f8d2dc
Binary files /dev/null and b/public/img/icons/32/blog_admin.png differ
diff --git a/public/img/icons/32/blog_na.png b/public/img/icons/32/blog_na.png
new file mode 100644
index 0000000000..237bdff461
Binary files /dev/null and b/public/img/icons/32/blog_na.png differ
diff --git a/public/img/icons/32/chat_na.png b/public/img/icons/32/chat_na.png
new file mode 100644
index 0000000000..40c38f6538
Binary files /dev/null and b/public/img/icons/32/chat_na.png differ
diff --git a/public/img/icons/32/course_progress_na.png b/public/img/icons/32/course_progress_na.png
new file mode 100644
index 0000000000..fcd0106229
Binary files /dev/null and b/public/img/icons/32/course_progress_na.png differ
diff --git a/public/img/icons/32/customcertificate.png b/public/img/icons/32/customcertificate.png
new file mode 100644
index 0000000000..eaef9d9cc0
Binary files /dev/null and b/public/img/icons/32/customcertificate.png differ
diff --git a/public/img/icons/32/customcertificate_na.png b/public/img/icons/32/customcertificate_na.png
new file mode 100644
index 0000000000..e2b9228c34
Binary files /dev/null and b/public/img/icons/32/customcertificate_na.png differ
diff --git a/public/img/icons/32/documents.png b/public/img/icons/32/documents.png
new file mode 100644
index 0000000000..a04b201c2b
Binary files /dev/null and b/public/img/icons/32/documents.png differ
diff --git a/public/img/icons/32/documents_na.png b/public/img/icons/32/documents_na.png
new file mode 100644
index 0000000000..0a2bbe33ab
Binary files /dev/null and b/public/img/icons/32/documents_na.png differ
diff --git a/public/img/icons/32/dropbox_na.png b/public/img/icons/32/dropbox_na.png
new file mode 100644
index 0000000000..7f5c86c76b
Binary files /dev/null and b/public/img/icons/32/dropbox_na.png differ
diff --git a/public/img/icons/32/folder_document_na.png b/public/img/icons/32/folder_document_na.png
new file mode 100644
index 0000000000..a7ae53f077
Binary files /dev/null and b/public/img/icons/32/folder_document_na.png differ
diff --git a/public/img/icons/32/forum_na.png b/public/img/icons/32/forum_na.png
new file mode 100644
index 0000000000..d1f2a1427e
Binary files /dev/null and b/public/img/icons/32/forum_na.png differ
diff --git a/public/img/icons/32/glossary_na.png b/public/img/icons/32/glossary_na.png
new file mode 100644
index 0000000000..d75839e488
Binary files /dev/null and b/public/img/icons/32/glossary_na.png differ
diff --git a/public/img/icons/32/gradebook_na.png b/public/img/icons/32/gradebook_na.png
new file mode 100644
index 0000000000..05f6cdfff4
Binary files /dev/null and b/public/img/icons/32/gradebook_na.png differ
diff --git a/public/img/icons/32/info_na.png b/public/img/icons/32/info_na.png
new file mode 100644
index 0000000000..3a15e84edc
Binary files /dev/null and b/public/img/icons/32/info_na.png differ
diff --git a/public/img/icons/32/links_na.png b/public/img/icons/32/links_na.png
new file mode 100644
index 0000000000..fe22009f4e
Binary files /dev/null and b/public/img/icons/32/links_na.png differ
diff --git a/public/img/icons/32/members_na.png b/public/img/icons/32/members_na.png
new file mode 100644
index 0000000000..b988331f4f
Binary files /dev/null and b/public/img/icons/32/members_na.png differ
diff --git a/public/img/icons/32/multiplicate_survey.png b/public/img/icons/32/multiplicate_survey.png
new file mode 100644
index 0000000000..7cf110f151
Binary files /dev/null and b/public/img/icons/32/multiplicate_survey.png differ
diff --git a/public/img/icons/32/multiplicate_survey_na.png b/public/img/icons/32/multiplicate_survey_na.png
new file mode 100644
index 0000000000..99943c5e6e
Binary files /dev/null and b/public/img/icons/32/multiplicate_survey_na.png differ
diff --git a/public/img/icons/32/notebook_na.png b/public/img/icons/32/notebook_na.png
new file mode 100644
index 0000000000..b84b981863
Binary files /dev/null and b/public/img/icons/32/notebook_na.png differ
diff --git a/public/img/icons/32/notebookteacher.png b/public/img/icons/32/notebookteacher.png
new file mode 100644
index 0000000000..f97a206a27
Binary files /dev/null and b/public/img/icons/32/notebookteacher.png differ
diff --git a/public/img/icons/32/notebookteacher_na.png b/public/img/icons/32/notebookteacher_na.png
new file mode 100644
index 0000000000..79a8b94a22
Binary files /dev/null and b/public/img/icons/32/notebookteacher_na.png differ
diff --git a/public/img/icons/32/outbox.png b/public/img/icons/32/outbox.png
index b58954cb2c..c056e7f649 100644
Binary files a/public/img/icons/32/outbox.png and b/public/img/icons/32/outbox.png differ
diff --git a/public/img/icons/32/statistics_na.png b/public/img/icons/32/statistics_na.png
new file mode 100644
index 0000000000..955d66185f
Binary files /dev/null and b/public/img/icons/32/statistics_na.png differ
diff --git a/public/img/icons/32/survey_na.png b/public/img/icons/32/survey_na.png
new file mode 100644
index 0000000000..1114b0f6ce
Binary files /dev/null and b/public/img/icons/32/survey_na.png differ
diff --git a/public/img/icons/32/test2pdf.png b/public/img/icons/32/test2pdf.png
new file mode 100644
index 0000000000..0f48891f3c
Binary files /dev/null and b/public/img/icons/32/test2pdf.png differ
diff --git a/public/img/icons/32/test2pdf_na.png b/public/img/icons/32/test2pdf_na.png
new file mode 100644
index 0000000000..6ad4e92e88
Binary files /dev/null and b/public/img/icons/32/test2pdf_na.png differ
diff --git a/public/img/icons/32/valves_na.png b/public/img/icons/32/valves_na.png
new file mode 100644
index 0000000000..aa81cd0d04
Binary files /dev/null and b/public/img/icons/32/valves_na.png differ
diff --git a/public/img/icons/32/warning.png b/public/img/icons/32/warning.png
index 78cfb8315f..14776e2d6e 100644
Binary files a/public/img/icons/32/warning.png and b/public/img/icons/32/warning.png differ
diff --git a/public/img/icons/32/wiki_na.png b/public/img/icons/32/wiki_na.png
new file mode 100644
index 0000000000..f0223c4391
Binary files /dev/null and b/public/img/icons/32/wiki_na.png differ
diff --git a/public/img/icons/32/wiki_task_na.png b/public/img/icons/32/wiki_task_na.png
new file mode 100644
index 0000000000..8bebe42634
Binary files /dev/null and b/public/img/icons/32/wiki_task_na.png differ
diff --git a/public/img/icons/32/works_na.png b/public/img/icons/32/works_na.png
new file mode 100644
index 0000000000..c81461125c
Binary files /dev/null and b/public/img/icons/32/works_na.png differ
diff --git a/public/img/icons/48/add_doodle.png b/public/img/icons/48/add_doodle.png
new file mode 100644
index 0000000000..b4aa6b0a26
Binary files /dev/null and b/public/img/icons/48/add_doodle.png differ
diff --git a/public/img/icons/48/external_link.png b/public/img/icons/48/external_link.png
new file mode 100644
index 0000000000..7f59baf6dc
Binary files /dev/null and b/public/img/icons/48/external_link.png differ
diff --git a/public/img/icons/48/multiplicate_survey.png b/public/img/icons/48/multiplicate_survey.png
new file mode 100644
index 0000000000..856a38b825
Binary files /dev/null and b/public/img/icons/48/multiplicate_survey.png differ
diff --git a/public/img/icons/48/multiplicate_survey_na.png b/public/img/icons/48/multiplicate_survey_na.png
new file mode 100644
index 0000000000..c8733b8207
Binary files /dev/null and b/public/img/icons/48/multiplicate_survey_na.png differ
diff --git a/public/img/icons/48/statistics_na.png b/public/img/icons/48/statistics_na.png
new file mode 100644
index 0000000000..0c5c765964
Binary files /dev/null and b/public/img/icons/48/statistics_na.png differ
diff --git a/public/img/icons/64/add_doodle.png b/public/img/icons/64/add_doodle.png
new file mode 100644
index 0000000000..c28a295023
Binary files /dev/null and b/public/img/icons/64/add_doodle.png differ
diff --git a/public/img/icons/64/external_link.png b/public/img/icons/64/external_link.png
new file mode 100644
index 0000000000..eea5da10fc
Binary files /dev/null and b/public/img/icons/64/external_link.png differ
diff --git a/public/img/icons/64/multiplicate_survey.png b/public/img/icons/64/multiplicate_survey.png
new file mode 100644
index 0000000000..09565fd8fb
Binary files /dev/null and b/public/img/icons/64/multiplicate_survey.png differ
diff --git a/public/img/icons/64/multiplicate_survey_na.png b/public/img/icons/64/multiplicate_survey_na.png
new file mode 100644
index 0000000000..dd2e03847c
Binary files /dev/null and b/public/img/icons/64/multiplicate_survey_na.png differ
diff --git a/public/img/icons/64/notebookteacher.png b/public/img/icons/64/notebookteacher.png
new file mode 100644
index 0000000000..16910c58af
Binary files /dev/null and b/public/img/icons/64/notebookteacher.png differ
diff --git a/public/img/icons/64/notebookteacher_na.png b/public/img/icons/64/notebookteacher_na.png
new file mode 100644
index 0000000000..4e699071f0
Binary files /dev/null and b/public/img/icons/64/notebookteacher_na.png differ
diff --git a/public/img/icons/64/plugins.png b/public/img/icons/64/plugins.png
index 99cb117f78..292dcd8518 100644
Binary files a/public/img/icons/64/plugins.png and b/public/img/icons/64/plugins.png differ
diff --git a/public/img/icons/64/statistics_na.png b/public/img/icons/64/statistics_na.png
new file mode 100644
index 0000000000..aac8842684
Binary files /dev/null and b/public/img/icons/64/statistics_na.png differ
diff --git a/public/img/icons/64/test2pdf.png b/public/img/icons/64/test2pdf.png
new file mode 100644
index 0000000000..bd097745dc
Binary files /dev/null and b/public/img/icons/64/test2pdf.png differ
diff --git a/public/img/icons/64/test2pdf_na.png b/public/img/icons/64/test2pdf_na.png
new file mode 100644
index 0000000000..d3c9e5d92c
Binary files /dev/null and b/public/img/icons/64/test2pdf_na.png differ
diff --git a/public/img/icons/svg/add_doodle.svg b/public/img/icons/svg/add_doodle.svg
new file mode 100644
index 0000000000..f8f39b8ad5
--- /dev/null
+++ b/public/img/icons/svg/add_doodle.svg
@@ -0,0 +1,2218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   id="svg12385"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="add_doodle.svg">
+  <defs
+     id="defs12387">
+    <linearGradient
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       x1="74.5"
+       y1="5.0479002"
+       x2="74.5"
+       y2="124.2402"
+       gradientTransform="matrix(1.0333334,0,0,1.0333334,-146.78079,923.78137)">
+      <stop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="stop4539" />
+      <stop
+         offset="1"
+         style="stop-color:#E1E1DF"
+         id="stop4541" />
+    </linearGradient>
+    <linearGradient
+       id="XMLID_9_"
+       gradientUnits="userSpaceOnUse"
+       x1="74.5"
+       y1="11.0811"
+       x2="74.5"
+       y2="121.4673"
+       gradientTransform="matrix(1.0333334,0,0,1.0333334,-146.99926,923.78137)">
+      <stop
+         offset="0"
+         style="stop-color:#FDFDFD"
+         id="stop4546" />
+      <stop
+         offset="0.2985"
+         style="stop-color:#F3F2F2"
+         id="stop4548" />
+      <stop
+         offset="0.8174"
+         style="stop-color:#D7D6D6"
+         id="stop4550" />
+      <stop
+         offset="1"
+         style="stop-color:#CCCBCA"
+         id="stop4552" />
+    </linearGradient>
+    <radialGradient
+       id="XMLID_10_"
+       cx="110"
+       cy="32.869099"
+       r="15.5963"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0333334,0,0,1.0333334,-146.78079,923.78137)">
+      <stop
+         offset="0.2135"
+         style="stop-color:#8E8E8F"
+         id="stop4557" />
+      <stop
+         offset="0.927"
+         style="stop-color:#EEEEEE"
+         id="stop4559" />
+    </radialGradient>
+    <linearGradient
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse"
+       x1="92.023399"
+       y1="9.9473"
+       x2="104.2735"
+       y2="32.947201"
+       gradientTransform="matrix(1.0333334,0,0,1.0333334,-146.78079,923.78137)">
+      <stop
+         offset="0"
+         style="stop-color:#FFFEFE"
+         id="stop4566" />
+      <stop
+         offset="1"
+         style="stop-color:#CFD0D0"
+         id="stop4568" />
+    </linearGradient>
+    <linearGradient
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse"
+       x1="99.530296"
+       y1="5.1806998"
+       x2="105.9053"
+       y2="31.930599"
+       gradientTransform="matrix(1.0333334,0,0,1.0333334,-146.78079,923.78137)">
+      <stop
+         offset="0"
+         style="stop-color:#FCFDFD"
+         id="stop4573" />
+      <stop
+         offset="1"
+         style="stop-color:#EEEEEE"
+         id="stop4575" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44699">
+      <stop
+         offset="0"
+         style="stop-color:#000173;stop-opacity:0.93333334"
+         id="stop44701" />
+      <stop
+         offset="1"
+         style="stop-color:#3575f0;stop-opacity:1"
+         id="stop44703" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44693">
+      <stop
+         offset="0"
+         style="stop-color:#3690e6;stop-opacity:1"
+         id="stop44695" />
+      <stop
+         offset="1"
+         style="stop-color:#d0e9ff;stop-opacity:1"
+         id="stop44697" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44681">
+      <stop
+         offset="0"
+         style="stop-color:#ff5c38;stop-opacity:1"
+         id="stop44683" />
+      <stop
+         offset="0.30397323"
+         style="stop-color:#fb7e65;stop-opacity:0.99607843"
+         id="stop44685" />
+      <stop
+         offset="1"
+         style="stop-color:#cd0000;stop-opacity:0.98039216"
+         id="stop44687" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44627">
+      <stop
+         offset="0"
+         style="stop-color:#fffcfb;stop-opacity:1"
+         id="stop44629" />
+      <stop
+         offset="1"
+         style="stop-color:#f4ad94;stop-opacity:1"
+         id="stop44633" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44615">
+      <stop
+         offset="0"
+         style="stop-color:#2f68fa;stop-opacity:1"
+         id="stop44617" />
+      <stop
+         offset="1"
+         style="stop-color:#c7d5fb;stop-opacity:1"
+         id="stop44619" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44605">
+      <stop
+         offset="0"
+         style="stop-color:#d0ecff;stop-opacity:1"
+         id="stop44607" />
+      <stop
+         offset="0.5"
+         style="stop-color:#d7f0ff;stop-opacity:1"
+         id="stop44609" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop44611" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44090">
+      <stop
+         offset="0"
+         style="stop-color:#0926bb;stop-opacity:1"
+         id="stop44092" />
+      <stop
+         offset="1"
+         style="stop-color:#6bb5fe;stop-opacity:1"
+         id="stop44094" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44080">
+      <stop
+         offset="0"
+         style="stop-color:#2c8300;stop-opacity:1"
+         id="stop44082" />
+      <stop
+         offset="0.25"
+         style="stop-color:#57aeff;stop-opacity:1"
+         id="stop44084" />
+      <stop
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop44086" />
+      <stop
+         offset="1"
+         style="stop-color:#5aafff;stop-opacity:1"
+         id="stop44088" />
+    </linearGradient>
+    <filter
+       id="filter3297">
+      <feGaussianBlur
+         id="feGaussianBlur3299"
+         stdDeviation="0.26694977"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter3293">
+      <feGaussianBlur
+         id="feGaussianBlur3295"
+         stdDeviation="0.355"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient3219">
+      <stop
+         offset="0"
+         style="stop-color:#0e7309;stop-opacity:1"
+         id="stop3221" />
+      <stop
+         offset="1"
+         style="stop-color:#70d13e;stop-opacity:1"
+         id="stop3223" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44627"
+       id="radialGradient44048"
+       fy="59.728882"
+       fx="53.60223"
+       r="17.834057"
+       cy="59.728882"
+       cx="53.60223" />
+    <radialGradient
+       gradientTransform="matrix(0.856113,-0.0637264,0.1161478,1.5603521,-743.30707,-121.7687)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44605"
+       id="radialGradient44061"
+       fy="709.6579"
+       fx="479.68311"
+       r="5.0058851"
+       cy="709.6579"
+       cx="479.68311" />
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,1,253.42404,245.75912)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44090"
+       id="linearGradient44067"
+       y2="745.30084"
+       x2="517.02167"
+       y1="705.48438"
+       x1="517.02167" />
+    <linearGradient
+       gradientTransform="translate(-730.02214,245.75912)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44090"
+       id="linearGradient44070"
+       y2="745.30084"
+       x2="517.02167"
+       y1="705.48438"
+       x1="517.02167" />
+    <radialGradient
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1075.328,-66.735647)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44080"
+       id="radialGradient44073"
+       fy="670.92523"
+       fx="491.52231"
+       r="36.426601"
+       cy="670.92523"
+       cx="491.52231" />
+    <linearGradient
+       gradientTransform="translate(-282.47353,882.69271)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44699"
+       id="linearGradient44076"
+       y2="66.310989"
+       x2="83.28125"
+       y1="123.09795"
+       x1="83.28125" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44615"
+       id="linearGradient44613"
+       y2="964.61743"
+       x2="-248.7769"
+       y1="958.07971"
+       x1="-246.57739" />
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,1,-476.93424,0)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44615"
+       id="linearGradient44625"
+       y2="964.61743"
+       x2="-248.7769"
+       y1="958.07971"
+       x1="-246.57739" />
+    <linearGradient
+       gradientTransform="translate(-772.48144,227.87334)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3219"
+       id="linearGradient44667"
+       y2="745.30084"
+       x2="517.02167"
+       y1="705.48438"
+       x1="517.02167" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44681"
+       id="linearGradient44677"
+       y2="47.542713"
+       x2="60.126968"
+       y1="81.913818"
+       x1="60.126968" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44693"
+       id="linearGradient44691"
+       y2="84.910484"
+       x2="-35.566662"
+       y1="76.562927"
+       x1="-35.566662" />
+    <linearGradient
+       y2="124.2402"
+       x2="74.5"
+       y1="5.0479002"
+       x1="74.5"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_8_-9">
+      <stop
+         id="stop4539-2"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop4541-2"
+         style="stop-color:#E1E1DF"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="121.4673"
+       x2="74.5"
+       y1="11.0811"
+       x1="74.5"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_9_-3">
+      <stop
+         id="stop4546-1"
+         style="stop-color:#FDFDFD"
+         offset="0" />
+      <stop
+         id="stop4548-8"
+         style="stop-color:#F3F2F2"
+         offset="0.2985" />
+      <stop
+         id="stop4550-3"
+         style="stop-color:#D7D6D6"
+         offset="0.8174" />
+      <stop
+         id="stop4552-4"
+         style="stop-color:#CCCBCA"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="15.5963"
+       cy="32.869099"
+       cx="110"
+       id="XMLID_10_-2">
+      <stop
+         id="stop4557-2"
+         style="stop-color:#8E8E8F"
+         offset="0.2135" />
+      <stop
+         id="stop4559-4"
+         style="stop-color:#EEEEEE"
+         offset="0.927" />
+    </radialGradient>
+    <linearGradient
+       y2="32.947201"
+       x2="104.2735"
+       y1="9.9473"
+       x1="92.023399"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_-5">
+      <stop
+         id="stop4566-1"
+         style="stop-color:#FFFEFE"
+         offset="0" />
+      <stop
+         id="stop4568-7"
+         style="stop-color:#CFD0D0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="31.930599"
+       x2="105.9053"
+       y1="5.1806998"
+       x1="99.530296"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_-5">
+      <stop
+         id="stop4573-7"
+         style="stop-color:#FCFDFD"
+         offset="0" />
+      <stop
+         id="stop4575-1"
+         style="stop-color:#EEEEEE"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3607">
+      <stop
+         id="stop3609"
+         style="stop-color:#f9fbff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3611"
+         style="stop-color:#62aaff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3596">
+      <stop
+         id="stop3598"
+         style="stop-color:#0035ed;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3615"
+         style="stop-color:#1c7eff;stop-opacity:1"
+         offset="0.55445766" />
+      <stop
+         id="stop3600"
+         style="stop-color:#98cbff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3585">
+      <stop
+         id="stop3587"
+         style="stop-color:#00008d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3589"
+         style="stop-color:#0048b7;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="2891.4258"
+       y1="317.79666"
+       x2="2758.4744"
+       y2="1350.958"
+       id="linearGradient3628"
+       xlink:href="#linearGradient3607"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.03112505,0,0,0.03112505,-59.971883,66.472321)" />
+    <linearGradient
+       x1="2758.4746"
+       y1="288.13559"
+       x2="2745.7627"
+       y2="1792.3729"
+       id="linearGradient3630"
+       xlink:href="#linearGradient3585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.03112505,0,0,0.03112505,-59.971883,66.472321)" />
+    <linearGradient
+       x1="3275.4238"
+       y1="627.11865"
+       x2="2453.3899"
+       y2="1682.2034"
+       id="linearGradient3632"
+       xlink:href="#linearGradient3596"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.03112505,0,0,0.03112505,-59.971883,66.472321)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       id="perspective84" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_25_"
+       id="linearGradient2890"
+       gradientUnits="userSpaceOnUse"
+       x1="16.371099"
+       y1="14.8774"
+       x2="43.506901"
+       y2="33.663799" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3749,0,0,0.375,14.9959,15)"
+       fy="47.091801"
+       fx="49.904301"
+       r="30.083599"
+       cy="47.091801"
+       cx="49.904301"
+       id="XMLID_15_">
+      <stop
+         id="stop555"
+         style="stop-color:#fbfd4a;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop556"
+         style="stop-color:#ff3600;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop557"
+         style="stop-color:#85CAFF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop558"
+         style="stop-color:#85CAFF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop559"
+         style="stop-color:#003DA9"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       y2="40.926601"
+       x2="33.705101"
+       y1="29.922899"
+       x1="33.705101"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_16_">
+      <stop
+         id="stop562"
+         style="stop-color:#ffc842;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop563"
+         style="stop-color:#ffc842;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop564"
+         style="stop-color:#3399FF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop565"
+         style="stop-color:#3399FF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop566"
+         style="stop-color:#3399FF"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="29.578199"
+       x2="36.868999"
+       y1="24.517099"
+       x1="43.617199"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_17_">
+      <stop
+         id="stop569"
+         style="stop-color:#ffc842;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop570"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop571"
+         style="stop-color:#3399FF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop572"
+         style="stop-color:#3399FF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop573"
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.9573,0.289,-0.289,0.9573,14.7332,63.9165)"
+       y2="-47.087399"
+       x2="15.6533"
+       y1="-47.087399"
+       x1="-12.502"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_18_">
+      <stop
+         id="stop578"
+         style="stop-color:#888888"
+         offset="0" />
+      <stop
+         id="stop579"
+         style="stop-color:#555555"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop580"
+         style="stop-color:#888888"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop581"
+         style="stop-color:#888888"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop582"
+         style="stop-color:#555555"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.9573,0.289,-0.289,0.9573,14.7332,63.9165)"
+       y2="-21.1413"
+       x2="27.521299"
+       y1="-52.9189"
+       x1="-4.2563"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_19_">
+      <stop
+         id="stop586"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop587"
+         style="stop-color:#fbf885;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop588"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop589"
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop590"
+         style="stop-color:#99CCFF"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3749,0,0,0.375,14.9959,15)"
+       fy="37.996101"
+       fx="16.351601"
+       r="49.414799"
+       cy="37.996101"
+       cx="16.351601"
+       id="XMLID_20_">
+      <stop
+         id="stop594"
+         style="stop-color:#fbfd4a;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop595"
+         style="stop-color:#ff3600;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop596"
+         style="stop-color:#85CAFF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop597"
+         style="stop-color:#85CAFF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop598"
+         style="stop-color:#003DA9"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3714,-0.0512,0.0511,0.3715,13.2666,17.0873)"
+       fy="18.062"
+       fx="38.167999"
+       r="90.268204"
+       cy="18.062"
+       cx="38.167999"
+       id="XMLID_21_">
+      <stop
+         id="stop602"
+         style="stop-color:#fbf885;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop603"
+         style="stop-color:#ffc842;stop-opacity:1;"
+         offset="0.5" />
+      <stop
+         id="stop604"
+         style="stop-color:#ff8119;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop605"
+         style="stop-color:#99CCFF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop606"
+         style="stop-color:#99CCFF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop607"
+         style="stop-color:#3399FF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop608"
+         style="stop-color:#3399FF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop609"
+         style="stop-color:#3366FF"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       gradientTransform="matrix(0.9907,-0.1364,0.1364,0.9907,-4.6134,5.5667)"
+       y2="11.9287"
+       x2="9.6625996"
+       y1="14.9292"
+       x1="9.6625996"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_22_">
+      <stop
+         id="stop612"
+         style="stop-color:#ffc842;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop613"
+         style="stop-color:#ffdd57;stop-opacity:1;"
+         offset="0.0546" />
+      <stop
+         id="stop614"
+         style="stop-color:#fde059;stop-opacity:1;"
+         offset="0.34369999" />
+      <stop
+         id="stop615"
+         style="stop-color:#fbe865;stop-opacity:1;"
+         offset="0.60750002" />
+      <stop
+         id="stop616"
+         style="stop-color:#faea66;stop-opacity:1;"
+         offset="0.83499998" />
+      <stop
+         id="stop617"
+         style="stop-color:#fbf885;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop618"
+         style="stop-color:#3399FF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop619"
+         style="stop-color:#3399FF"
+         offset="0.3616" />
+      <a:midPointStop
+         id="midPointStop620"
+         style="stop-color:#99CCFF"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.9907,-0.1364,0.1364,0.9907,-4.6134,5.5667)"
+       y2="34.062"
+       x2="29.0541"
+       y1="13.7358"
+       x1="13.4614"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_23_">
+      <stop
+         id="stop623"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop624"
+         style="stop-color:#f8ff51;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop625"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop626"
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop627"
+         style="stop-color:#66B3FF"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="44.4342"
+       x2="49.274101"
+       y1="19.9067"
+       x1="24.746599"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_24_">
+      <stop
+         id="stop632"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <stop
+         id="stop633"
+         style="stop-color:#f9ff4d;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop634"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop635"
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop636"
+         style="stop-color:#99CCFF"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="33.663799"
+       x2="43.506901"
+       y1="14.8774"
+       x1="16.371099"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_25_">
+      <stop
+         id="stop639"
+         style="stop-color:#ffc842;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop640"
+         style="stop-color:#d34900;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop641"
+         style="stop-color:#3399FF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop642"
+         style="stop-color:#3399FF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop643"
+         style="stop-color:#0066CC"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="26.7041"
+       x2="40.507801"
+       y1="26.7041"
+       x1="12.4033"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_27_">
+      <stop
+         id="stop647"
+         style="stop-color:#888888"
+         offset="0" />
+      <stop
+         id="stop648"
+         style="stop-color:#555555"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop649"
+         style="stop-color:#888888"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop650"
+         style="stop-color:#888888"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop651"
+         style="stop-color:#555555"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="36.6497"
+       x2="36.143501"
+       y1="40.627899"
+       x1="41.544899"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_28_">
+      <stop
+         id="stop655"
+         style="stop-color:#ffff7e;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop656"
+         style="stop-color:#ff9e00;stop-opacity:1;"
+         offset="1" />
+      <a:midPointStop
+         id="midPointStop657"
+         style="stop-color:#C5F0FF"
+         offset="0" />
+      <a:midPointStop
+         id="midPointStop658"
+         style="stop-color:#C5F0FF"
+         offset="0.5" />
+      <a:midPointStop
+         id="midPointStop659"
+         style="stop-color:#1D74D9"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3297-5">
+      <feGaussianBlur
+         id="feGaussianBlur3299-2"
+         stdDeviation="0.26694977"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter3293-1">
+      <feGaussianBlur
+         id="feGaussianBlur3295-9"
+         stdDeviation="0.355"
+         inkscape:collect="always" />
+    </filter>
+    <radialGradient
+       gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44627"
+       id="radialGradient44048-0"
+       fy="59.728882"
+       fx="53.60223"
+       r="17.834057"
+       cy="59.728882"
+       cx="53.60223" />
+    <radialGradient
+       gradientTransform="matrix(0.856113,-0.0637264,0.1161478,1.5603521,-743.30707,-121.7687)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44605"
+       id="radialGradient44061-6"
+       fy="709.6579"
+       fx="479.68311"
+       r="5.0058851"
+       cy="709.6579"
+       cx="479.68311" />
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,1,253.42404,245.75912)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44090"
+       id="linearGradient44067-4"
+       y2="745.30084"
+       x2="517.02167"
+       y1="705.48438"
+       x1="517.02167" />
+    <linearGradient
+       gradientTransform="translate(-730.02214,245.75912)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44090"
+       id="linearGradient44070-9"
+       y2="745.30084"
+       x2="517.02167"
+       y1="705.48438"
+       x1="517.02167" />
+    <radialGradient
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1075.328,-66.735647)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44080"
+       id="radialGradient44073-9"
+       fy="670.92523"
+       fx="491.52231"
+       r="36.426601"
+       cy="670.92523"
+       cx="491.52231" />
+    <linearGradient
+       gradientTransform="translate(-282.47353,882.69271)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44699"
+       id="linearGradient44076-0"
+       y2="66.310989"
+       x2="83.28125"
+       y1="123.09795"
+       x1="83.28125" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44615"
+       id="linearGradient44613-8"
+       y2="964.61743"
+       x2="-248.7769"
+       y1="958.07971"
+       x1="-246.57739" />
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,1,-476.93424,0)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44615"
+       id="linearGradient44625-9"
+       y2="964.61743"
+       x2="-248.7769"
+       y1="958.07971"
+       x1="-246.57739" />
+    <linearGradient
+       gradientTransform="translate(-772.48144,227.87334)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3219"
+       id="linearGradient44667-3"
+       y2="745.30084"
+       x2="517.02167"
+       y1="705.48438"
+       x1="517.02167" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44681"
+       id="linearGradient44677-1"
+       y2="47.542713"
+       x2="60.126968"
+       y1="81.913818"
+       x1="60.126968" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient44693"
+       id="linearGradient44691-4"
+       y2="84.910484"
+       x2="-35.566662"
+       y1="76.562927"
+       x1="-35.566662" />
+    <linearGradient
+       id="linearGradient3510">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3512" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3514" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3498">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3500" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop3502" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4099">
+      <stop
+         style="stop-color:#6f726f;stop-opacity:1;"
+         offset="0"
+         id="stop4101" />
+      <stop
+         style="stop-color:#6f726f;stop-opacity:0;"
+         offset="1"
+         id="stop4103" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4068">
+      <stop
+         style="stop-color:#eaeae9;stop-opacity:1;"
+         offset="0"
+         id="stop4070" />
+      <stop
+         style="stop-color:#a5a7a2;stop-opacity:1;"
+         offset="1"
+         id="stop4072" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3670">
+      <stop
+         style="stop-color:#d3d7cf"
+         offset="0"
+         id="stop3672" />
+      <stop
+         style="stop-color:#555753"
+         offset="1"
+         id="stop3674" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3670"
+       r="9.375"
+       id="radialGradient3634"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.240749,0,0,1.157631,-1.713645,-1.134736)"
+       fy="7.1986876"
+       fx="6.8797626"
+       cy="7.1986876"
+       cx="6.8797626" />
+    <linearGradient
+       id="linearGradient3692">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3694" />
+      <stop
+         style="stop-color:#babdb6"
+         offset="1"
+         id="stop3696" />
+    </linearGradient>
+    <linearGradient
+       y2="19.269905"
+       y1="-0.51990569"
+       xlink:href="#linearGradient3692"
+       x2="-0.51990569"
+       x1="-0.51990569"
+       id="linearGradient3698"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient3670"
+       r="9.375"
+       id="radialGradient3644"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06370852,-1.424475,1.547293,0.0692112,-9.530629,30.98681)"
+       fy="13.847466"
+       fx="12.704856"
+       cy="13.847466"
+       cx="12.704856" />
+    <linearGradient
+       id="linearGradient3730">
+      <stop
+         style="stop-color:#eeeeec"
+         offset="0"
+         id="stop3732" />
+      <stop
+         style="stop-color:#888a85"
+         offset="1"
+         id="stop3734" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3730"
+       r="9.9205227"
+       id="radialGradient3728"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
+       fy="0.99004257"
+       fx="-1.0016617"
+       cy="0.99004257"
+       cx="-1.0016617" />
+    <linearGradient
+       id="linearGradient1557">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop1559" />
+      <stop
+         style="stop-color:#888a85"
+         offset="1"
+         id="stop1561" />
+    </linearGradient>
+    <linearGradient
+       y2="5.375"
+       y1="34.950001"
+       xlink:href="#linearGradient1557"
+       x2="20.3125"
+       x1="17.0625"
+       id="linearGradient1549"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3676">
+      <stop
+         style="stop-color:#eeeeec"
+         offset="0"
+         id="stop4022" />
+      <stop
+         style="stop-color:#555753"
+         offset="1"
+         id="stop3680" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3676"
+       r="9.9205227"
+       id="radialGradient3702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
+       fy="0.99004257"
+       fx="-1.0016617"
+       cy="0.99004257"
+       cx="-1.0016617" />
+    <linearGradient
+       id="linearGradient3788">
+      <stop
+         style="stop-color:#cccdcb;stop-opacity:1;"
+         offset="0"
+         id="stop3790" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="1"
+         id="stop3792" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3657">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3659" />
+      <stop
+         style="stop-color:#bfbfbf;stop-opacity:1;"
+         offset="1"
+         id="stop3661" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3611-6" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <linearGradient
+       y2="8.6796741"
+       y1="4.9369388"
+       xlink:href="#linearGradient4608"
+       x2="56.609135"
+       x1="56.302975"
+       id="linearGradient4585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.4611255,0,0,4.4611255,-215.94246,23.775709)" />
+    <linearGradient
+       y2="40.9986"
+       y1="35.01503"
+       xlink:href="#linearGradient4608"
+       x2="57.954308"
+       x1="58.015995"
+       spreadMethod="reflect"
+       id="linearGradient4641"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.997993,0,0,1,-97.71685,-9.352993)" />
+    <linearGradient
+       id="linearGradient4608">
+      <stop
+         style="stop-color:#eeeeec"
+         offset="0"
+         id="stop4610" />
+      <stop
+         style="stop-color:#8a8c87;stop-opacity:1;"
+         offset="1"
+         id="stop4612" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3609"
+       r="5.524272"
+       id="radialGradient3615"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.3143547,0,0,3.989648,-5.4983517,12.909402)"
+       fy="17.403807"
+       fx="6.4081554"
+       cy="17.403807"
+       cx="6.4081554" />
+    <linearGradient
+       y2="18.984955"
+       y1="8.2899637"
+       xlink:href="#linearGradient3657"
+       x2="10.4375"
+       x1="10.4375"
+       id="linearGradient3668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-64.70027,0)" />
+    <radialGradient
+       xlink:href="#linearGradient3510"
+       r="2.9831069"
+       id="radialGradient3680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8458078,0,-3.7315016e-8,4.4587336,6.5267879,12.165891)"
+       fy="12.516305"
+       fx="5.0822492"
+       cy="12.516305"
+       cx="5.0822492" />
+    <linearGradient
+       y2="11.030003"
+       y1="11.030003"
+       xlink:href="#linearGradient3788"
+       x2="10.4375"
+       x1="8.0536165"
+       id="linearGradient3794"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-64.70027,0)" />
+    <linearGradient
+       y2="27.345011"
+       y1="20.301662"
+       xlink:href="#linearGradient4068"
+       x2="7.3215322"
+       x1="7.5763841"
+       id="linearGradient4095"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="25.736509"
+       y1="25.559732"
+       xlink:href="#linearGradient4099"
+       x2="9.346509"
+       x1="11.125889"
+       id="linearGradient4105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.267068,0,0,3.267068,-5.8152962,-21.586126)" />
+    <linearGradient
+       y2="24.317278"
+       y1="24.665476"
+       xlink:href="#linearGradient3510"
+       x2="8.3712559"
+       x1="4.6831217"
+       id="linearGradient3287"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient3498"
+       r="1.2404948"
+       id="radialGradient3504"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(33.771851,-1.0380269e-5,1.7219594e-5,56.02335,-1144.2052,-1310.0735)"
+       fy="24.427671"
+       fx="36.82843"
+       cy="24.427677"
+       cx="36.82843" />
+    <radialGradient
+       xlink:href="#linearGradient3498"
+       r="1.2404948"
+       id="radialGradient3506"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(53.169249,0,0,56.023199,-1858.5804,-1310.0705)"
+       fy="24.427683"
+       fx="36.82843"
+       cy="24.427683"
+       cx="36.82843" />
+    <radialGradient
+       xlink:href="#linearGradient3498"
+       r="1.2404948"
+       id="radialGradient3508"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(33.771851,-1.0380269e-5,1.7219594e-5,56.02335,-1144.2052,-1310.0735)"
+       fy="24.427671"
+       fx="36.82843"
+       cy="24.427677"
+       cx="36.82843" />
+    <linearGradient
+       gradientTransform="matrix(2.5205338,0,0,2.5205338,6.7325386,-3.1243099)"
+       y2="22.637957"
+       y1="22.107626"
+       xlink:href="#linearGradient3510"
+       x2="7.378232"
+       x1="9.485774"
+       id="linearGradient3516"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       id="filter5198">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1236084"
+         id="feGaussianBlur5200" />
+    </filter>
+    <linearGradient
+       gradientTransform="matrix(0.45718256,0,0,0.45718256,-125.85122,67.08849)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_4_"
+       id="linearGradient5613"
+       y2="99.457672"
+       x2="63.999996"
+       y1="-1.1782227"
+       x1="64" />
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,-1,128,128)"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_4_"
+       y2="99.457672"
+       x2="63.999996"
+       y1="-1.1782227"
+       x1="64">
+      <stop
+         offset="0"
+         style="stop-color:#0053bd;stop-opacity:1"
+         id="stop105" />
+      <stop
+         offset="1"
+         style="stop-color:#00008d;stop-opacity:1"
+         id="stop107" />
+      <midPointStop
+         id="midPointStop109"
+         style="stop-color:#00008D"
+         offset="0" />
+      <midPointStop
+         id="midPointStop111"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop113"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(-0.95919902,0.62734453,-0.48564594,-0.74254472,390.95468,162.6776)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#radialGradient4602"
+       id="radialGradient5615"
+       fy="388.16513"
+       fx="323.32462"
+       r="49.621826"
+       cy="388.16513"
+       cx="323.32462" />
+    <radialGradient
+       gradientTransform="matrix(1,0,0,1.0565,0,-0.544571)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4602"
+       fy="107.81738"
+       fx="27.575684"
+       r="115.48331"
+       cy="107.81738"
+       cx="27.575684">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4604" />
+      <stop
+         offset="0.0571753"
+         style="stop-color:#ddeeff;stop-opacity:1"
+         id="stop4606" />
+      <stop
+         offset="0.13292681"
+         style="stop-color:#b5daff;stop-opacity:1"
+         id="stop4608" />
+      <stop
+         offset="0.1933101"
+         style="stop-color:#9dceff;stop-opacity:1"
+         id="stop4610-6" />
+      <stop
+         offset="0.23033699"
+         style="stop-color:#94caff;stop-opacity:1"
+         id="stop4612-8" />
+      <stop
+         offset="0.59550601"
+         style="stop-color:#0b74ff;stop-opacity:1"
+         id="stop4614" />
+      <stop
+         offset="0.81460702"
+         style="stop-color:#0035ed;stop-opacity:1"
+         id="stop4616" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <midPointStop
+         id="midPointStop136"
+         style="stop-color:#FFFFFF"
+         offset="0.4" />
+      <midPointStop
+         id="midPointStop138"
+         style="stop-color:#94CAFF"
+         offset="0.230337" />
+      <midPointStop
+         id="midPointStop140"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop142"
+         style="stop-color:#0B74FF"
+         offset="0.595506" />
+      <midPointStop
+         id="midPointStop144"
+         style="stop-color:#0B74FF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop146"
+         style="stop-color:#0035ED"
+         offset="0.814607" />
+    </radialGradient>
+    <linearGradient
+       gradientTransform="matrix(0.45718256,0,0,-0.45718256,-124.33546,125.60786)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4619"
+       id="linearGradient5617"
+       y2="63.596096"
+       x2="62.342285"
+       y1="16.278811"
+       x1="62.342285" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4619"
+       y2="61.276535"
+       x2="62.342281"
+       y1="8.8261719"
+       x1="62.342285">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4621" />
+      <stop
+         offset="1"
+         style="stop-color:#74aeff;stop-opacity:1"
+         id="stop4623" />
+      <midPointStop
+         id="midPointStop157"
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <midPointStop
+         id="midPointStop159"
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop161"
+         style="stop-color:#74AEFF"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5376">
+      <stop
+         style="stop-color:#e7e7e7;stop-opacity:1;"
+         offset="0"
+         id="stop5384" />
+      <stop
+         id="stop5380"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5360">
+      <stop
+         id="stop5362"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5364"
+         offset="1"
+         style="stop-color:#e7e7e7;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5352">
+      <stop
+         id="stop5354"
+         offset="0"
+         style="stop-color:#4e111d;stop-opacity:1;" />
+      <stop
+         id="stop5356"
+         offset="1"
+         style="stop-color:#8f1a1e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5328">
+      <stop
+         id="stop5330"
+         offset="0"
+         style="stop-color:#7c1315;stop-opacity:1;" />
+      <stop
+         id="stop5332"
+         offset="1"
+         style="stop-color:#e81c24;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5320">
+      <stop
+         id="stop5322"
+         offset="0"
+         style="stop-color:#e5e5e5;stop-opacity:1;" />
+      <stop
+         id="stop5324"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient5314">
+      <stop
+         id="stop5316"
+         offset="0"
+         style="stop-color:#ededed;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3830"
+       inkscape:persp3d-origin="494 : 329.33333 : 1"
+       inkscape:vp_z="1106.4104 : 523.60261 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="14.801303 : 428.87427 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       gradientTransform="translate(345.06811,407.2935)"
+       gradientUnits="userSpaceOnUse"
+       y2="101.63474"
+       x2="421.45139"
+       y1="101.63474"
+       x1="-95.114098"
+       id="linearGradient5326-4"
+       xlink:href="#linearGradient5320"
+       inkscape:collect="always" />
+    <radialGradient
+       xlink:href="#linearGradient3670"
+       r="9.375"
+       id="radialGradient3634-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.240749,0,0,1.157631,-1.713645,-1.134736)"
+       fy="7.1986876"
+       fx="6.8797626"
+       cy="7.1986876"
+       cx="6.8797626" />
+    <radialGradient
+       xlink:href="#linearGradient3670"
+       r="9.375"
+       id="radialGradient3644-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06370852,-1.424475,1.547293,0.0692112,-9.530629,30.98681)"
+       fy="13.847466"
+       fx="12.704856"
+       cy="13.847466"
+       cx="12.704856" />
+    <radialGradient
+       xlink:href="#linearGradient3730"
+       r="9.9205227"
+       id="radialGradient3728-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,17.75288,16.41459)"
+       fy="0.99004257"
+       fx="-1.0016617"
+       cy="0.99004257"
+       cx="-1.0016617" />
+    <radialGradient
+       xlink:href="#linearGradient3676"
+       r="9.9205227"
+       id="radialGradient3702-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,17.48751,15.56121)"
+       fy="0.99004257"
+       fx="-1.0016617"
+       cy="0.99004257"
+       cx="-1.0016617" />
+    <linearGradient
+       y2="8.6796741"
+       y1="4.9369388"
+       xlink:href="#linearGradient4608"
+       x2="56.609135"
+       x1="56.302975"
+       id="linearGradient4585-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.769913,0,0,1.769913,-88.34438,10.67235)" />
+    <radialGradient
+       xlink:href="#linearGradient3609"
+       r="5.524272"
+       id="radialGradient3615-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.416,0,10.16382)"
+       fy="17.403807"
+       fx="6.4081554"
+       cy="17.403807"
+       cx="6.4081554" />
+    <radialGradient
+       xlink:href="#linearGradient3510"
+       r="2.9831069"
+       id="radialGradient3680-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.525791,0,-1.480441e-8,1.768964,-0.08162983,6.066255)"
+       fy="12.516305"
+       fx="5.0822492"
+       cy="12.516305"
+       cx="5.0822492" />
+    <linearGradient
+       y2="25.736509"
+       y1="25.559732"
+       xlink:href="#linearGradient4099"
+       x2="9.346509"
+       x1="11.125889"
+       id="linearGradient4105-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.296181,0,0,1.296181,-4.978245,-7.324566)" />
+    <radialGradient
+       xlink:href="#linearGradient3498"
+       r="1.2404949"
+       id="radialGradient3504-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
+       fy="24.427671"
+       fx="36.82843"
+       cy="24.427677"
+       cx="36.82843" />
+    <radialGradient
+       xlink:href="#linearGradient3498"
+       r="1.2404949"
+       id="radialGradient3506-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(21.09444,2.34445e-15,1.470518e-12,22.22672,-740.0468,-518.5196)"
+       fy="24.427683"
+       fx="36.82843"
+       cy="24.427683"
+       cx="36.82843" />
+    <radialGradient
+       xlink:href="#linearGradient3498"
+       r="1.2404949"
+       id="radialGradient3508-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(13.39869,-4.118282e-6,6.831725e-6,22.22678,-456.6246,-518.5208)"
+       fy="24.427671"
+       fx="36.82843"
+       cy="24.427677"
+       cx="36.82843" />
+    <linearGradient
+       y2="22.637957"
+       y1="22.107626"
+       xlink:href="#linearGradient3510"
+       x2="7.378232"
+       x1="9.485774"
+       id="linearGradient3516-6"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       id="clipPath9750"
+       clipPathUnits="userSpaceOnUse">
+      <g
+         style="fill:#265165;fill-opacity:1;stroke:none"
+         transform="matrix(0.67877845,0,-0.43891498,0.67877845,798.30404,345.95012)"
+         id="g9752">
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1444.5578,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9754"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9756"
+           d="m 1450.8361,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1457.1144,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9758"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9760"
+           d="m 1463.3926,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1469.671,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9762"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9764"
+           d="m 1475.9492,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1482.2275,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9766"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9768"
+           d="m 1488.5059,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1494.7841,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9770"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9772"
+           d="m 1501.0624,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1507.3408,1117.3546 3.9952,0 0,98.7642 -3.9952,0 z"
+           id="path9774"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9776"
+           d="m 1513.619,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1519.8973,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9778"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9780"
+           d="m 1526.1756,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1532.4539,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9782"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9784"
+           d="m 1538.7322,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1545.0105,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9786"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9788"
+           d="m 1551.2888,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1557.5671,1117.3546 3.9952,0 0,98.7642 -3.9952,0 z"
+           id="path9790"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9792"
+           d="m 1563.8454,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1570.1237,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9794"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9796"
+           d="m 1576.4019,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1582.6803,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9798"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9800"
+           d="m 1588.9586,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1595.2368,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9802"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9804"
+           d="m 1601.5152,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1607.7935,1117.3546 3.9952,0 0,98.7642 -3.9952,0 z"
+           id="path9806"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9808"
+           d="m 1614.0717,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1620.35,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9810"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9812"
+           d="m 1626.6283,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1632.9066,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9814"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9816"
+           d="m 1639.1849,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1645.4632,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9818"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9820"
+           d="m 1651.7415,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1658.0197,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9822"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9824"
+           d="m 1664.2981,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1670.5764,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9826"
+           inkscape:connector-curvature="0" />
+      </g>
+    </clipPath>
+    <linearGradient
+       id="linearGradient14440">
+      <stop
+         offset="0"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop14442" />
+      <stop
+         id="stop14444"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         offset="0.37668341" />
+      <stop
+         offset="1"
+         style="stop-color:#ff6600;stop-opacity:1"
+         id="stop14446" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4799"
+       id="radialGradient5866"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1410082,0,0,2.1915147,-83.639894,11.827919)"
+       cx="55.21796"
+       cy="458.46527"
+       fx="55.21796"
+       fy="458.46527"
+       r="15.213428" />
+    <linearGradient
+       id="linearGradient4799">
+      <stop
+         style="stop-color:#f6ff00;stop-opacity:1"
+         offset="0"
+         id="stop4801" />
+      <stop
+         style="stop-color:#ffa700;stop-opacity:1;"
+         offset="1"
+         id="stop4803" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_8_-9"
+       id="linearGradient8155"
+       gradientUnits="userSpaceOnUse"
+       x1="74.5"
+       y1="5.0479002"
+       x2="74.5"
+       y2="124.2402" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_9_-3"
+       id="linearGradient8157"
+       gradientUnits="userSpaceOnUse"
+       x1="74.5"
+       y1="11.0811"
+       x2="74.5"
+       y2="121.4673" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_10_-2-4"
+       id="radialGradient8159"
+       gradientUnits="userSpaceOnUse"
+       cx="110"
+       cy="32.869099"
+       r="15.5963" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="15.5963"
+       cy="32.869099"
+       cx="110"
+       id="XMLID_10_-2-4">
+      <stop
+         id="stop4557-2-3"
+         style="stop-color:#8E8E8F"
+         offset="0.2135" />
+      <stop
+         id="stop4559-4-6"
+         style="stop-color:#EEEEEE"
+         offset="0.927" />
+    </radialGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_11_-5"
+       id="linearGradient8161"
+       gradientUnits="userSpaceOnUse"
+       x1="92.023399"
+       y1="9.9473"
+       x2="104.2735"
+       y2="32.947201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_-5"
+       id="linearGradient8163"
+       gradientUnits="userSpaceOnUse"
+       x1="99.530296"
+       y1="5.1806998"
+       x2="105.9053"
+       y2="31.930599" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3994534"
+     inkscape:cx="28.822235"
+     inkscape:cy="56.599672"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata12390">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.3622)">
+    <g
+       id="g6118"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/22/add_doodle.png"
+       inkscape:export-xdpi="16.549898"
+       inkscape:export-ydpi="16.549898">
+      <g
+         inkscape:export-ydpi="24"
+         inkscape:export-xdpi="24"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         id="g8127"
+         transform="matrix(1.0371509,0,0,1.0371509,-10.967659,919.98259)">
+        <path
+           d="M 30.666,7 C 28.816,7 27,8.83 27,10.694 c 0,106.39 0,106.39 0,109.807 0,3.917 4,4.499 4,4.499 h 87 c 0,0 4,-0.268 4,-4.018 0,-3.75 0,-78.479 0,-78.479 C 122,37.306 94.325,7 87.135,7 Z"
+           id="path8129"
+           inkscape:connector-curvature="0"
+           style="opacity:0.2" />
+        <path
+           d="M 30.666,8 C 28.816,8 27,9.83 27,11.694 c 0,106.39 0,106.39 0,109.807 0,3.917 5,4.499 5,4.499 h 85 c 0,0 5,-0.268 5,-4.018 0,-3.75 0,-78.479 0,-78.479 C 122,38.306 94.325,8 87.135,8 Z"
+           id="path8131"
+           inkscape:connector-curvature="0"
+           style="opacity:0.2" />
+        <path
+           d="M 30.666,6 C 28.816,6 27,7.83 27,9.694 c 0,106.39 0,106.39 0,109.807 0,3.917 3,4.499 3,4.499 h 89 c 0,0 3,-0.268 3,-4.018 0,-3.75 0,-78.479 0,-78.479 C 122,36.306 94.325,6 87.135,6 Z"
+           id="path8133"
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;fill:#262626" />
+        <path
+           d="m 121,120.113 c 0,2.584 -2.398,2.887 -2.398,2.887 H 30.498 C 30.498,123 28,122.525 28,119.917 28,100.1 28,10.861 28,9.694 28,8.374 29.359,7 30.666,7 31.66,7 79.135,7 87.135,7 94.167,7 121,37.326 121,41.504 c 0,4.619 0,63.145 0,78.609 z"
+           id="path8135"
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient8155)" />
+        <path
+           d="m 120,119.282 c 0,2.481 -2,2.718 -2,2.718 H 31 c 0,0 -2,-0.163 -2,-2.249 C 29,101.736 29,10.877 29,9.694 29,8.374 30.317,7 31.583,7 32.547,7 79.442,7 87.193,7 94.006,7 120,37.326 120,41.504 c 0,4.63 0,62.674 0,77.778 z"
+           id="path8137"
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient8157)" />
+        <path
+           d="m 120,39 c 0,7.18 -2.82,13 -10,13 -7.18,0 -16,-5.82 -16,-13 0,-7.18 2.82,-9 10,-9 7.18,0 11,4 16,9 z"
+           id="path8139"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient8159)" />
+        <path
+           d="m 84.415,6.963 c 0.547,0 0.947,0.002 3.616,1.193 4.182,1.891 4.103,22.225 4.103,26.673 l -0.001,0.128 c 0,0.521 0.399,0.959 0.918,1.002 5.973,0.496 23.318,-0.848 26.406,4.026 1.199,1.608 1.365,2.858 1.918,2.858 0.553,0 0.625,-0.786 0.625,-1.339 0,-0.797 -0.257,-1.574 -0.766,-2.428 -0.004,-0.009 -0.002,-0.018 -0.006,-0.026 -0.014,-0.028 -0.038,-0.065 -0.053,-0.094 V 38.955 C 118.87,34.256 95.385,8.574 88.821,6.365 88.815,6.363 88.814,6.357 88.809,6.355 88.802,6.352 88.794,6.353 88.788,6.351 88.767,6.343 88.739,6.328 88.718,6.32 88.624,6.291 88.531,6.279 88.439,6.277 88.01,6.133 87.578,6 87.135,6 86.627,6 84.473,6.457 84.415,6.963 Z"
+           id="path8141"
+           inkscape:connector-curvature="0"
+           style="opacity:0.5;fill:#343434" />
+        <path
+           d="M 121,41.504 C 117.625,32.875 93.133,34.962 93.133,34.962 93.003,37.629 94.632,7 87.135,7 94.168,7 121,38.814 121,41.504 Z"
+           id="path8143"
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient8161)" />
+        <path
+           d="M 121,41.504 C 119.5,33.563 94.25,33.438 94.25,33.438 94.225,36.104 94.524,7 87.135,7 94.168,7 121,38.814 121,41.504 Z"
+           id="path8145"
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient8163)" />
+      </g>
+      <rect
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         y="924.36218"
+         x="0"
+         height="127.61408"
+         width="127.73791"
+         id="rect5912"
+         style="opacity:1;fill:#e9feff;fill-opacity:0;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         ry="0"
+         y="924.36218"
+         x="0"
+         height="127.61408"
+         width="127.73791"
+         id="rect7366"
+         style="opacity:1;fill:#afdde9;fill-opacity:0;stroke:none;stroke-width:0.09173347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path4210"
+         d="M 46.479206,967.70115 V 983.4364 H 62.214479 V 967.70115 Z"
+         style="fill:#bdc3c7;stroke-width:1.34681022" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path4208"
+         d="M 69.306084,967.70115 V 983.4364 H 85.041358 V 967.70115 Z"
+         style="fill:#55d400;stroke-width:1.34681022" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path4179"
+         d="m 69.306084,991.30407 v 15.73523 h 15.735274 v -15.73523 z"
+         style="fill:#55d400;stroke-width:1.34681022" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path4177"
+         d="m 92.132958,991.30407 v 15.73523 h 15.735282 v -15.73523 z"
+         style="fill:#bdc3c7;stroke-width:1.34681022" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path24"
+         d="m 92.132966,967.70113 v 15.73528 h 15.735264 v -15.73528 z"
+         style="fill:#bdc3c7;stroke-width:1.34681022" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path4220"
+         d="m 45.802493,1014.9071 v 15.7351 h 15.735273 v -15.7351 z"
+         style="fill:#bdc3c7;stroke-width:1.34681022" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         inkscape:connector-curvature="0"
+         id="path4218"
+         d="m 69.306084,1014.9071 v 15.7351 h 15.735274 v -15.7351 z"
+         style="fill:#55d400;stroke-width:1.34681022" />
+      <text
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         id="text4347"
+         y="959.89142"
+         x="46.355892"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.10715103px;line-height:1.25;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#216778;fill-opacity:1;stroke:none;stroke-width:0.55268878"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.10715103px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#216778;stroke-width:0.55268878"
+           y="959.89142"
+           x="46.355892"
+           id="tspan4345"
+           sodipodi:role="line">1</tspan></text>
+      <text
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.10715103px;line-height:1.25;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#216778;fill-opacity:1;stroke:none;stroke-width:0.55268878"
+         x="68.990089"
+         y="959.89142"
+         id="text4351"><tspan
+           sodipodi:role="line"
+           id="tspan4349"
+           x="68.990089"
+           y="959.89142"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.10715103px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#216778;stroke-width:0.55268878">2</tspan></text>
+      <circle
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         r="7.1549845"
+         cy="975.56879"
+         cx="32.232616"
+         id="path4361"
+         style="opacity:1;fill:#454837;fill-opacity:1;stroke:none;stroke-width:2.81068563;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.81068565, 2.81068565;stroke-dashoffset:0;stroke-opacity:1" />
+      <circle
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         style="opacity:1;fill:#454837;fill-opacity:1;stroke:none;stroke-width:2.81068563;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.81068565, 2.81068565;stroke-dashoffset:0;stroke-opacity:1"
+         id="circle4363"
+         cx="32.232616"
+         cy="999.17169"
+         r="7.1549845" />
+      <path
+         inkscape:export-ydpi="24.072578"
+         inkscape:export-xdpi="24.072578"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/32/add_doodle.png"
+         style="fill:url(#radialGradient5866);fill-opacity:1;stroke:#ff4100;stroke-width:3.21151209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 31.436322,1006.9102 -0.108945,-19.48767 c 0.124869,-4.27916 7.859189,-4.03359 8.383039,-0.1086 v 19.26997 l 12.955598,-13.06429 c 3.179145,-2.98242 7.803655,2.25232 5.008046,5.22575 l -12.084636,13.60874 16.983817,0.1086 c 4.954275,0.6433 4.329836,8.8279 0.21768,9.1454 l -16.439462,-0.1086 12.411241,11.9757 c 2.930235,3.2807 -0.978942,8.964 -5.334651,6.0971 l -13.935438,-13.3913 -0.108902,19.2699 c 0.492686,4.0925 -7.893918,4.8654 -8.709646,0.1087 l 0.108902,-18.2902 -12.302383,12.3024 c -4.330894,1.0659 -7.886146,-2.013 -6.205621,-5.7701 l 13.06447,-12.5202 -18.8346093,0.218 c -4.6395274,-0.901 -4.5269561,-8.541 0.1089403,-9.145 l 19.270086,-0.1087 -13.499947,-13.28219 c -2.6265477,-4.18023 1.880171,-8.41204 5.443528,-5.87911 z"
+         id="path4797"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/public/img/icons/svg/external_link.svg b/public/img/icons/svg/external_link.svg
new file mode 100644
index 0000000000..7ad4aa0a0e
--- /dev/null
+++ b/public/img/icons/svg/external_link.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="128"
+   viewBox="0 0 128 128"
+   width="128"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="external_link.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8">
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       r="117.14286"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       r="117.14286"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop5056" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       y2="609.50507"
+       y1="366.64789"
+       xlink:href="#linearGradient5048"
+       x2="302.85715"
+       x1="302.85715"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
+    <linearGradient
+       id="linearGradient11520">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop11522" />
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop11524" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       r="6.5659914"
+       id="radialGradient1348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.338462,0,29.48178)"
+       fy="44.565483"
+       fx="30.203562"
+       cy="44.565483"
+       cx="30.203562" />
+    <radialGradient
+       xlink:href="#linearGradient11520"
+       r="20.530962"
+       id="radialGradient1366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0332421,0,0,1.0332421,-13.047087,-19.221421)"
+       fy="35.87817"
+       fx="24.44569"
+       cy="35.87817"
+       cx="24.44569" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1319"
+     inkscape:window-height="713"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="2"
+     inkscape:cx="102.21806"
+     inkscape:cy="29.007403"
+     inkscape:window-x="47"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <g
+     id="g1121"
+     transform="translate(0.58755422,-1.3133354)"
+     inkscape:export-filename="/var/www/chamilo/main/img/icons/16/external_link.png"
+     inkscape:export-xdpi="12"
+     inkscape:export-ydpi="12">
+    <rect
+       y="1.3133354"
+       x="-0.58755422"
+       height="128"
+       width="128"
+       id="rect1111"
+       style="opacity:1;fill:#cbe4ff;fill-opacity:0;stroke:none;stroke-width:25.76903534;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       transform="matrix(7.4377987,0,0,7.4377987,-27.054286,-19.297854)"
+       id="g1109">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.43343499"
+         inkscape:original="M 13.705078 4.3925781 A 0.7727402 0.7727402 0 0 0 13.738281 5.9375 L 16.503906 5.9375 L 8.5605469 13.888672 A 0.7727402 0.7727402 0 1 0 9.6425781 14.986328 L 17.601562 7.0273438 L 17.601562 9.8007812 A 0.7727402 0.7727402 0 0 0 19.146484 9.8007812 L 19.146484 5.1640625 A 0.7727402 0.7727402 0 0 0 18.375 4.3925781 L 13.738281 4.3925781 A 0.7727402 0.7727402 0 0 0 13.705078 4.3925781 z "
+         style="fill:#3566a4;fill-opacity:1;stroke-width:0.77274019"
+         id="path1025"
+         d="m 13.689453,3.9589844 c -0.624612,0.023526 -1.17554,0.6075108 -1.162109,1.2324218 0.01342,0.6242928 0.586611,1.1819055 1.210937,1.1796876 h 1.71875 l -7.2031248,7.2109372 0.025391,-0.02344 c -0.2517986,0.214144 -0.4093209,0.535007 -0.4238281,0.865234 -0.014507,0.330227 0.1156067,0.66499 0.3476562,0.900391 0.2320495,0.2354 0.5641303,0.369146 0.8945312,0.359375 0.330401,-0.0098 0.6533617,-0.163407 0.8710938,-0.41211 l 7.199219,-7.1972652 v 1.7265624 a 0.43347834,0.43347834 0 0 0 0,0.011719 c 0.01668,0.620519 0.584334,1.173828 1.205078,1.173828 0.620743,0 1.190346,-0.553309 1.207031,-1.173828 a 0.43347834,0.43347834 0 0 0 0,-0.011719 V 5.1640625 C 19.579055,4.5338174 19.005245,3.9600081 18.375,3.9589844 h -4.626953 c -0.01727,-3.712e-4 -0.03546,-3.712e-4 -0.05274,0 a 0.43347834,0.43347834 0 0 0 -0.0059,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         d="M 17.601428,7.0271384 9.6422038,14.986362 A 0.7727402,0.7727402 0 1 1 8.5603676,13.889071 L 16.504137,5.9375747 h -2.76641 a 0.7727402,0.7727402 0 0 1 0,-1.5454804 h 4.636441 a 0.7727402,0.7727402 0 0 1 0.77274,0.7727402 v 4.6364412 a 0.7727402,0.7727402 0 0 1 -1.54548,0 z"
+         id="path819"
+         style="fill:#98b9dc;fill-opacity:1;stroke-width:0.77274019" />
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.49225906"
+         inkscape:original="M 6.7832031 5.9375 C 5.9331889 5.9375 5.2382812 6.6324077 5.2382812 7.4824219 L 5.2382812 16.755859 A 1.5454804 1.5454804 0 0 0 6.7832031 18.300781 L 16.056641 18.300781 A 1.5454804 1.5454804 0 0 0 17.601562 16.755859 L 17.601562 12.892578 A 0.7727405 0.7727405 0 0 0 16.056641 12.892578 L 16.056641 16.755859 L 6.7832031 16.755859 L 6.7832031 7.4824219 L 10.646484 7.4824219 A 0.7727402 0.7727402 0 0 0 10.646484 5.9375 L 6.7832031 5.9375 z "
+         style="fill:#3566a4;fill-opacity:1;stroke-width:0.77274019"
+         id="path1021"
+         d="m 6.7832031,5.4453125 c -1.1183035,0 -2.0371094,0.9188058 -2.0371093,2.0371094 v 9.2734371 c 1.926e-4,0.533234 0.2206032,1.0624 0.5976562,1.439453 0.377053,0.377054 0.9062196,0.597464 1.4394531,0.597657 h 9.2734379 c 0.533233,-1.93e-4 1.0624,-0.220603 1.439453,-0.597657 0.377053,-0.377053 0.597463,-0.906219 0.597656,-1.439453 v -3.863281 a 0.49230828,0.49230828 0 0 0 0,-0.01367 c -0.01752,-0.650764 -0.614624,-1.230469 -1.265625,-1.230468 -0.651001,0 -1.246148,0.579704 -1.263672,1.230468 a 0.49230828,0.49230828 0 0 0 0,0.01367 v 3.371094 H 7.2753906 V 7.9746094 h 3.3710934 a 0.49230828,0.49230828 0 0 0 0.01367,0 c 0.650781,-0.0175 1.230469,-0.6126563 1.230469,-1.2636719 0,-0.6510156 -0.579688,-1.2481246 -1.230469,-1.265625 a 0.49230828,0.49230828 0 0 0 -0.01367,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 16.055947,12.892236 a 0.7727405,0.7727405 0 0 1 1.545481,0 v 3.863702 a 1.5454804,1.5454804 0 0 1 -1.545481,1.54548 H 6.7830651 A 1.5454804,1.5454804 0 0 1 5.2375847,16.755938 V 7.4830551 c 0,-0.8500142 0.6954662,-1.5454804 1.5454804,-1.5454804 h 3.8637009 a 0.7727402,0.7727402 0 0 1 0,1.5454804 H 6.7830651 v 9.2728829 h 9.2728819 z"
+         id="path2"
+         style="fill:#5d91c9;fill-opacity:1;stroke-width:0.77274019" />
+      <path
+         style="fill:#98b9dc;fill-opacity:1;stroke-width:0.77274019"
+         id="path1045"
+         d="M 5.2375847,16.172145 V 7.4830551 c 0,-0.8500142 0.6954662,-1.5454804 1.5454804,-1.5454804 h 3.8637009 c 1.03032,0 1.03032,1.5454804 0,1.5454804 H 6.7830651 v 7.4866099 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssccc" />
+      <path
+         style="fill:#5d91c9;fill-opacity:1;stroke-width:0.77274019"
+         id="path1047"
+         d="M 17.601428,7.0271384 9.6422038,14.986362 c -0.3824604,0.43483 -0.9131974,0.259341 -1.1233276,0.05045 3.4505518,-3.49488 6.8466718,-7.0202284 10.3359958,-10.4765782 0.08898,0.064559 0.292036,0.2042691 0.292036,0.6046007 v 4.6364412 c -7.41e-4,1.0295783 -1.546221,1.0295783 -1.54548,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccsccc" />
+    </g>
+  </g>
+</svg>
diff --git a/public/img/icons/svg/multiplicate_survey.svg b/public/img/icons/svg/multiplicate_survey.svg
new file mode 100644
index 0000000000..06457c26e2
--- /dev/null
+++ b/public/img/icons/svg/multiplicate_survey.svg
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="multiplicate_survey.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4872">
+      <stop
+         style="stop-color:#58a5c1;stop-opacity:1"
+         offset="0"
+         id="stop4868" />
+      <stop
+         style="stop-color:#fbfbfb;stop-opacity:1"
+         offset="1"
+         id="stop4870" />
+    </linearGradient>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker4864"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         transform="scale(1.1) rotate(180) translate(1,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path4862" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker4858"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4856"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4609"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3480">
+      <stop
+         style="stop-color:#ff6600;stop-opacity:1"
+         offset="0"
+         id="stop3476" />
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1"
+         offset="1"
+         id="stop3478" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3480"
+       id="linearGradient2295"
+       x1="-23.909666"
+       y1="1078.3464"
+       x2="-30.067835"
+       y2="1011.3207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3632513,0,0,1.671541,77.67816,-730.28092)" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter2496"
+       x="-0.010880281"
+       width="1.0217606"
+       y="-0.013376624"
+       height="1.0267532">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.23167235"
+         id="feGaussianBlur2498" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4872"
+       id="linearGradient3454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.58775441,0,0,0.72067095,65.672392,196.62598)"
+       x1="-27.688286"
+       y1="1055.5681"
+       x2="-27.688286"
+       y2="1017.9606" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4872"
+       id="linearGradient4876"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.58775441,0,0,0.72067095,122.67438,265.33374)"
+       x1="-27.688286"
+       y1="1055.5681"
+       x2="-27.688286"
+       y2="1017.9606" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4872"
+       id="linearGradient4880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73685519,0,0,0.90348981,122.27587,21.440871)"
+       x1="-27.688286"
+       y1="1055.5681"
+       x2="-27.688286"
+       y2="1017.9606" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8384076"
+     inkscape:cx="92.033393"
+     inkscape:cy="47.60863"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36216)">
+    <g
+       id="g4937"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/128/multiplicate_survey.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         inkscape:export-ydpi="16.5"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         y="924.36218"
+         x="0"
+         height="128"
+         width="128"
+         id="rect4561"
+         style="opacity:0.36960012;fill:#00193e;fill-opacity:0;stroke:none;stroke-width:1.66299999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         inkscape:export-ydpi="16.5"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         transform="matrix(0.93063006,0,0,0.93063006,2.2156317,69.820664)"
+         id="g4884">
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect2279"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(1.3632514,0,0,1.6715409,78.02507,-729.90874)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <rect
+           style="opacity:1;fill:url(#linearGradient2295);fill-opacity:1;stroke:#ff8e01;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect2287"
+           width="69.666061"
+           height="69.479378"
+           x="4.6084313"
+           y="978.65106"
+           ry="5.1132021"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+      </g>
+      <g
+         inkscape:export-ydpi="16.5"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         transform="matrix(1.0779368,0,0,1.0779368,-2.1410026,-75.742823)"
+         id="g4905">
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect4892"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(0.58775443,0,0,0.72067088,58.828668,204.23326)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(0.58775443,0,0,0.72067088,61.879697,200.16434)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect3446"
+           style="opacity:1;fill:#000000;fill-opacity:0.42745098;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           ry="2.2045143"
+           y="933.41772"
+           x="34.168991"
+           height="29.955452"
+           width="30.035942"
+           id="rect3448"
+           style="opacity:1;fill:url(#linearGradient3454);fill-opacity:1;stroke:#1d8198;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+      <g
+         inkscape:export-ydpi="16.5"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         transform="matrix(1.0766861,0,0,1.0766861,-6.2987212,-76.791562)"
+         id="g4917">
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(0.58775443,0,0,0.72067088,113.49409,274.59135)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect4898"
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.42745098;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect4900"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(0.58775443,0,0,0.72067088,117.56566,269.75636)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <g
+           id="g4890"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5">
+          <rect
+             inkscape:export-ydpi="16.5"
+             inkscape:export-xdpi="16.5"
+             inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+             ry="2.2045143"
+             y="1002.1254"
+             x="91.170982"
+             height="29.955452"
+             width="30.035942"
+             id="rect4874"
+             style="opacity:1;fill:url(#linearGradient4876);fill-opacity:1;stroke:#1d8198;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="16.5"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         transform="translate(3.3081511,-3.0536779)"
+         id="g4911">
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(0.73905258,0,0,0.90618401,113.83899,27.862945)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect4896"
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.42807019;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect4894"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(0.73905258,0,0,0.90618401,117.65499,23.280877)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <g
+           id="g4887"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5">
+          <rect
+             style="opacity:1;fill:url(#linearGradient4880);fill-opacity:1;stroke:#1d8198;stroke-width:1.88051784;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="rect4878"
+             width="37.655422"
+             height="37.554512"
+             x="82.780708"
+             y="945.14099"
+             ry="2.7637527"
+             inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+             inkscape:export-xdpi="16.5"
+             inkscape:export-ydpi="16.5" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/icons/svg/multiplicate_survey_na.svg b/public/img/icons/svg/multiplicate_survey_na.svg
new file mode 100644
index 0000000000..1507e9225c
--- /dev/null
+++ b/public/img/icons/svg/multiplicate_survey_na.svg
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="multiplicate_survey_na.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.0070573"
+     inkscape:cx="60.958988"
+     inkscape:cy="19.789317"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4872"
+       inkscape:collect="always">
+      <stop
+         id="stop4868"
+         offset="0"
+         style="stop-color:#58a5c1;stop-opacity:1" />
+      <stop
+         id="stop4870"
+         offset="1"
+         style="stop-color:#fbfbfb;stop-opacity:1" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker4864"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4862"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker4858"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         transform="scale(1.1) rotate(180) translate(1,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path4856" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="Arrow2Mend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path4609" />
+    </marker>
+    <linearGradient
+       id="linearGradient3480"
+       inkscape:collect="always">
+      <stop
+         id="stop3476"
+         offset="0"
+         style="stop-color:#ff6600;stop-opacity:1" />
+      <stop
+         id="stop3478"
+         offset="1"
+         style="stop-color:#ffff00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.3632513,0,0,1.671541,77.67816,-730.28092)"
+       gradientUnits="userSpaceOnUse"
+       y2="1011.3207"
+       x2="-30.067835"
+       y1="1078.3464"
+       x1="-23.909666"
+       id="linearGradient2295"
+       xlink:href="#linearGradient3480"
+       inkscape:collect="always" />
+    <filter
+       height="1.0267532"
+       y="-0.013376624"
+       width="1.0217606"
+       x="-0.010880281"
+       id="filter2496"
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur2498"
+         stdDeviation="0.23167235"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       y2="1017.9606"
+       x2="-27.688286"
+       y1="1055.5681"
+       x1="-27.688286"
+       gradientTransform="matrix(0.58775441,0,0,0.72067095,65.672392,196.62598)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3454"
+       xlink:href="#linearGradient4872"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1017.9606"
+       x2="-27.688286"
+       y1="1055.5681"
+       x1="-27.688286"
+       gradientTransform="matrix(0.58775441,0,0,0.72067095,122.67438,265.33374)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4876"
+       xlink:href="#linearGradient4872"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1017.9606"
+       x2="-27.688286"
+       y1="1055.5681"
+       x1="-27.688286"
+       gradientTransform="matrix(0.73685519,0,0,0.90348981,122.27587,21.440871)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4880"
+       xlink:href="#linearGradient4872"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.3632513,0,0,1.671541,77.67816,-730.28092)"
+       gradientUnits="userSpaceOnUse"
+       y2="1021.5123"
+       x2="-23.125393"
+       y1="1069.2872"
+       x1="-23.631968"
+       id="linearGradient2295-692"
+       xlink:href="#linearGradient3480-289"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3480-289"
+       inkscape:collect="always">
+      <stop
+         id="stop889"
+         offset="0"
+         style="stop-color:#7f7f7f;stop-opacity:1;opacity:1" />
+      <stop
+         id="stop891"
+         offset="1"
+         style="stop-color:#f9f9f9;stop-opacity:1;opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="1017.9606"
+       x2="-27.688286"
+       y1="1055.5681"
+       x1="-27.688286"
+       gradientTransform="matrix(0.58775441,0,0,0.72067095,65.672392,196.62598)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3454-548"
+       xlink:href="#linearGradient4872-155"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4872-155"
+       inkscape:collect="always">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#8c8c8c;stop-opacity:1;opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#fbfbfb;stop-opacity:1;opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="1017.9606"
+       x2="-27.688286"
+       y1="1055.5681"
+       x1="-27.688286"
+       gradientTransform="matrix(0.58775441,0,0,0.72067095,122.67438,265.33374)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4876-311"
+       xlink:href="#linearGradient4872-435"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4872-435"
+       inkscape:collect="always">
+      <stop
+         id="stop901"
+         offset="0"
+         style="stop-color:#8c8c8c;stop-opacity:1;opacity:1" />
+      <stop
+         id="stop903"
+         offset="1"
+         style="stop-color:#fbfbfb;stop-opacity:1;opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="1017.9606"
+       x2="-27.688286"
+       y1="1055.5681"
+       x1="-27.688286"
+       gradientTransform="matrix(0.73685519,0,0,0.90348981,122.27587,21.440871)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4880-302"
+       xlink:href="#linearGradient4872-258"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4872-258"
+       inkscape:collect="always">
+      <stop
+         id="stop907"
+         offset="0"
+         style="stop-color:#8c8c8c;stop-opacity:1;opacity:1" />
+      <stop
+         id="stop909"
+         offset="1"
+         style="stop-color:#fbfbfb;stop-opacity:1;opacity:1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-924.36216)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Capa 1">
+    <g
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/128/multiplicate_survey_na.png"
+       id="g4937">
+      <rect
+         style="opacity:0.36960012;fill:#1f1f1f;fill-opacity:0;stroke:none;stroke-width:1.66299999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4561"
+         width="128"
+         height="128"
+         x="0"
+         y="924.36218"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-ydpi="16.5" />
+      <g
+         id="g4884"
+         transform="matrix(0.93063006,0,0,0.93063006,2.2156317,69.820664)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-ydpi="16.5">
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(1.3632514,0,0,1.6715409,78.02507,-729.90874)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect2279"
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           ry="5.1132021"
+           y="978.65106"
+           x="4.6084313"
+           height="69.479378"
+           width="69.666061"
+           id="rect2287"
+           style="opacity:1;fill:url(#linearGradient2295-692);fill-opacity:1;stroke:#5a5a5a;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+      <g
+         id="g4905"
+         transform="matrix(1.0779368,0,0,1.0779368,-2.1410026,-75.742823)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-ydpi="16.5">
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(0.58775443,0,0,0.72067088,58.828668,204.23326)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect4892"
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.42745098;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect3446"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(0.58775443,0,0,0.72067088,61.879697,200.16434)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <rect
+           style="opacity:1;fill:url(#linearGradient3454-548);fill-opacity:1;stroke:#5a5a5a;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3448"
+           width="30.035942"
+           height="29.955452"
+           x="34.168991"
+           y="933.41772"
+           ry="2.2045143"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+      </g>
+      <g
+         id="g4917"
+         transform="matrix(1.0766861,0,0,1.0766861,-6.2987212,-76.791562)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-ydpi="16.5">
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect4898"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(0.58775443,0,0,0.72067088,113.49409,274.59135)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(0.58775443,0,0,0.72067088,117.56566,269.75636)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect4900"
+           style="opacity:1;fill:#000000;fill-opacity:0.42745098;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <g
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           id="g4890">
+          <rect
+             style="opacity:1;fill:url(#linearGradient4876-311);fill-opacity:1;stroke:#5a5a5a;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="rect4874"
+             width="30.035942"
+             height="29.955452"
+             x="91.170982"
+             y="1002.1254"
+             ry="2.2045143"
+             inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+             inkscape:export-xdpi="16.5"
+             inkscape:export-ydpi="16.5" />
+        </g>
+      </g>
+      <g
+         id="g4911"
+         transform="translate(3.3081511,-3.0536779)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+         inkscape:export-xdpi="16.5"
+         inkscape:export-ydpi="16.5">
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)"
+           id="rect4896"
+           width="51.102875"
+           height="41.566067"
+           x="-52.795624"
+           y="1023.0187"
+           ry="3.058975"
+           transform="matrix(0.73905258,0,0,0.90618401,113.83899,27.862945)"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-ydpi="16.5" />
+        <rect
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           transform="matrix(0.73905258,0,0,0.90618401,117.65499,23.280877)"
+           ry="3.058975"
+           y="1023.0187"
+           x="-52.795624"
+           height="41.566067"
+           width="51.102875"
+           id="rect4894"
+           style="opacity:1;fill:#000000;fill-opacity:0.42807019;stroke:none;stroke-width:2.99524426;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.9952442, 2.9952442;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter2496)" />
+        <g
+           inkscape:export-ydpi="16.5"
+           inkscape:export-xdpi="16.5"
+           inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+           id="g4887">
+          <rect
+             inkscape:export-ydpi="16.5"
+             inkscape:export-xdpi="16.5"
+             inkscape:export-filename="/var/www/chamilo/main/img/icons/22/multiplicate_survey.png"
+             ry="2.7637527"
+             y="945.14099"
+             x="82.780708"
+             height="37.554512"
+             width="37.655422"
+             id="rect4878"
+             style="opacity:1;fill:url(#linearGradient4880-302);fill-opacity:1;stroke:#5a5a5a;stroke-width:1.88051784;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/icons/svg/outbox.svg b/public/img/icons/svg/outbox.svg
index d98c758e19..4ef30a2392 100644
--- a/public/img/icons/svg/outbox.svg
+++ b/public/img/icons/svg/outbox.svg
@@ -11,9 +11,9 @@
    height="128"
    version="1.1"
    width="128"
-   viewBox="0 0 128 128"
+viewBox="0 0 128 128"
    id="svg2"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:version="0.91 r"
    sodipodi:docname="outbox.svg">
   <metadata
      id="metadata18">
@@ -61,74 +61,56 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
      id="namedview14"
      showgrid="false"
-     inkscape:zoom="2.5111491"
-     inkscape:cx="76.494816"
-     inkscape:cy="51.389655"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:zoom="1.7383042"
+     inkscape:cx="42.662409"
+     inkscape:cy="25.439635"
+     inkscape:window-x="1366"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
-  <g
-     id="g865"
-     transform="matrix(1,0,0,0.99353159,-3.5668507,4.0374467)"
-     inkscape:export-filename="/var/www/chamilo2/public/img/icons/32/outbox.png"
-     inkscape:export-xdpi="24"
-     inkscape:export-ydpi="24">
-    <rect
-       y="-3.6470594"
-       x="3.5668507"
-       height="128"
-       width="128"
-       id="rect834"
-       style="opacity:0;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:1.93174791;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <g
-       transform="matrix(1.0600145,0,0,1.0600145,0.18414607,-6.2246514)"
-       id="g832">
-      <rect
-         y="4.7115331"
-         x="4.1345963"
-         height="118.86627"
-         width="118.86627"
-         id="rect14306"
-         style="opacity:0;fill:#ffffff;fill-opacity:0.99215686;stroke:none" />
-      <path
-         style="fill:#93a7ac;fill-opacity:1;stroke:none"
-         d="M 22.690507,45.908695 H 102.8893 L 120.98657,90.253183 95.831736,112.04331 33.722406,112.88053 7.1618176,90.047941 Z"
-         id="rect14227"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#afdde9;stroke:none"
-         d="M 30.128405,51.100892 97.733596,51.34853 115.06826,92.951725 94.656862,109.1637 36.813524,106.0561 13.041379,92.456449 Z"
-         id="path14236"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#004455;fill-opacity:1;stroke:none"
-         d="m 10.812637,72.150128 h 26.497272 c -3.043412,32.624552 49.198749,46.184262 52.746908,0 H 117.79228 V 115.73443 H 10.812637 Z"
-         id="rect14233"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#006680;fill-opacity:1"
-         d="M 104.42799,38.53023 H 96.121096 L 114.69395,75.675939 H 93.284274 c 0,16.410955 -13.305693,29.716531 -29.716568,29.716531 -16.410836,0 -29.716567,-13.305695 -29.716567,-29.716531 H 12.441501 L 31.014355,38.53023 H 22.707426 L 4.134571,75.675939 V 120.25079 H 123.00084 V 75.675939 Z"
-         id="path14221" />
-      <path
-         style="fill:#004455;fill-opacity:1;stroke:none"
-         d="m 22.624853,38.554122 81.665327,-0.17513 -4.1369,8.054894 -73.697961,0.08756 z"
-         id="rect14230"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:url(#linearGradient21217);fill-opacity:1"
-         d="M 62.517087,2.0385748 32.800519,31.755143 H 47.658803 V 76.329994 H 77.37537 V 31.755143 h 14.858284 z"
-         id="path14225"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
+  <rect
+     y="4.7115331"
+     x="4.1345963"
+     height="118.86627"
+     width="118.86627"
+     id="rect14306"
+     style="opacity:0;fill:#ffffff;fill-opacity:0.99215686;stroke:none" />
+  <path
+     style="fill:#93a7ac;fill-opacity:1;stroke:none"
+     d="m 22.690507,45.908695 80.198793,0 18.09727,44.344488 -25.154834,21.790127 -62.10933,0.83722 L 7.1618176,90.047941 Z"
+     id="rect14227"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#afdde9;stroke:none"
+     d="M 30.128405,51.100892 97.733596,51.34853 115.06826,92.951725 94.656862,109.1637 36.813524,106.0561 13.041379,92.456449 Z"
+     id="path14236"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#004455;fill-opacity:1;stroke:none"
+     d="m 10.812637,72.150128 26.497272,0 c -3.043412,32.624552 49.198749,46.184262 52.746908,0 l 27.735463,0 0,43.584302 -106.979643,0 z"
+     id="rect14233"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#006680;fill-opacity:1"
+     d="m 104.42799,38.53023 -8.306894,0 18.572854,37.145709 -21.409676,0 c 0,16.410955 -13.305693,29.716531 -29.716568,29.716531 -16.410836,0 -29.716567,-13.305695 -29.716567,-29.716531 l -21.409638,0 18.572854,-37.145709 -8.306929,0 -18.572855,37.145709 0,44.574851 118.866269,0 0,-44.574851 -18.57285,-37.145709 z"
+     id="path14221" />
+  <path
+     style="fill:#004455;fill-opacity:1;stroke:none"
+     d="m 22.624853,38.554122 81.665327,-0.17513 -4.1369,8.054894 -73.697961,0.08756 z"
+     id="rect14230"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:url(#linearGradient21217);fill-opacity:1"
+     d="m 62.517087,2.0385748 -29.716568,29.7165682 14.858284,0 0,44.574851 29.716567,0 0,-44.574851 14.858284,0 L 62.517087,2.0385748 Z"
+     id="path14225"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/public/img/lp_document.png b/public/img/lp_document.png
index 158e31941a..813f712f72 100644
Binary files a/public/img/lp_document.png and b/public/img/lp_document.png differ
diff --git a/public/img/session_default.png b/public/img/session_default.png
index 40c685d26a..294e8636a6 100644
Binary files a/public/img/session_default.png and b/public/img/session_default.png differ
diff --git a/src/CoreBundle/Component/Utils/ChamiloApi.php b/src/CoreBundle/Component/Utils/ChamiloApi.php
index df161994b2..ba8df78c99 100644
--- a/src/CoreBundle/Component/Utils/ChamiloApi.php
+++ b/src/CoreBundle/Component/Utils/ChamiloApi.php
@@ -289,12 +289,15 @@ class ChamiloApi
 
         return api_get_path(WEB_CSS_PATH).'editor_content.css';
     }
+
     /**
      * Get a list of colors from the palette at main/palette/pchart/default.color
-     * and return it as an array of strings
+     * and return it as an array of strings.
+     *
      * @param bool $decimalOpacity Whether to return the opacity as 0..100 or 0..1
-     * @param bool $wrapInRGBA Whether to return it as 1,1,1,100 or rgba(1,1,1,100)
-     * @param int  $fillUpTo If the number of colors is smaller than this number, generate more colors
+     * @param bool $wrapInRGBA     Whether to return it as 1,1,1,100 or rgba(1,1,1,100)
+     * @param int  $fillUpTo       If the number of colors is smaller than this number, generate more colors
+     *
      * @return array An array of string colors
      */
     public static function getColorPalette(
@@ -324,9 +327,10 @@ class ChamiloApi
         $count = count($palette);
         if (isset($fillUpTo) && $fillUpTo > $count) {
             for ($i = $count; $i < $fillUpTo; $i++) {
-                $palette[$i] = $palette[$i%$count];
+                $palette[$i] = $palette[$i % $count];
             }
         }
+
         return $palette;
     }
 }
diff --git a/src/ThemeBundle/Resources/views/Admin/switcher_links.html.twig b/src/ThemeBundle/Resources/views/Admin/switcher_links.html.twig
index 8832853f54..1fab42d261 100644
--- a/src/ThemeBundle/Resources/views/Admin/switcher_links.html.twig
+++ b/src/ThemeBundle/Resources/views/Admin/switcher_links.html.twig
@@ -24,26 +24,3 @@
 </div>
 {% endautoescape %}
 {% endif %}
-
-{#<div class="dropdown">#}
-    {#<button type="button" id="dropdownMenu1" data-toggle="dropdown"#}
-            {#aria-haspopup="true" aria-expanded="true">#}
-        {#<span class="lang-sm lang-lbl-full"#}
-              {#lang="{{ app.request.locale }}"></span> <span#}
-                {#class="caret"></span>#}
-    {#</button>#}
-    {#<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">#}
-
-    {#{% for locale in locales %}#}
-        {#{{ locale }}julio#}
-        {#<li>#}
-        {#<a href="{{ locale.link }}"#}
-           {#title="{{ locale.locale_target_language }}">#}
-            {#<span class="lang-sm lang-lbl-full" lang="{{ locale.locale }}"></span>#}
-            {#<span class="flag-icon flag-icon-{{ locale.locale }}"></span>#}
-            {#{{ locale.locale_target_language }}#}
-        {#</a>#}
-        {#</li>#}
-    {#{% endfor %}#}
-    {#</ul>#}
-{#</div>#}
diff --git a/src/ThemeBundle/Resources/views/Index/page.html.twig b/src/ThemeBundle/Resources/views/Index/page.html.twig
index 60e356784d..d59a8dd6bb 100644
--- a/src/ThemeBundle/Resources/views/Index/page.html.twig
+++ b/src/ThemeBundle/Resources/views/Index/page.html.twig
@@ -10,7 +10,7 @@
 
 {% set content %}
 
-    {{ macro.box_header("IntroductionOfPlatform" | get_lang, buttons) }}
+    {{ macro.box_header("IntroductionOfPlatform" | trans, buttons) }}
     {{ sonata_page_render_container('content', page) }}
 
 {% endset %}
diff --git a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
index 21096722cb..4755441011 100644
--- a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
@@ -122,7 +122,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | get_lang }}"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | trans }}"><span aria-hidden="true">&times;</span></button>
                 <h4 class="modal-title" id="expand-image-modal-title">&nbsp;</h4>
             </div>
             <div class="modal-body">
@@ -135,7 +135,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | get_lang }}">
+                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | trans }}">
                     <span aria-hidden="true">&times;</span>
                 </button>
                 <h4 class="modal-title" id="global-modal-title">&nbsp;</h4>
diff --git a/src/ThemeBundle/Resources/views/Layout/footer.html.twig b/src/ThemeBundle/Resources/views/Layout/footer.html.twig
index fee799e3a0..d60909ee57 100644
--- a/src/ThemeBundle/Resources/views/Layout/footer.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/footer.html.twig
@@ -9,7 +9,7 @@
         {{ administrator_name }}
     {% endif %}
     <a href="{{_p.web}}" target="_blank">
-        {{ "PoweredByX" |get_lang | format(_s.software_name) }}
+        {{ "PoweredByX" |trans | format(_s.software_name) }}
     </a>&copy; {{ "now"|date("Y") }}
 </footer>
 
@@ -22,7 +22,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="myModalLabel">{{ 'Delete' | get_lang }}</h4>
+                <h4 class="modal-title" id="myModalLabel">{{ 'Delete' | trans }}</h4>
             </div>
 
             <div class="modal-body">
@@ -30,8 +30,8 @@
             </div>
 
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'Cancel' | get_lang }}</button>
-                <a id="delete_item" class="btn btn-danger btn-ok">{{ 'Delete' | get_lang }}</a>
+                <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'Cancel' | trans }}</button>
+                <a id="delete_item" class="btn btn-danger btn-ok">{{ 'Delete' | trans }}</a>
             </div>
         </div>
     </div>
diff --git a/src/ThemeBundle/Resources/views/Layout/menu.html.twig b/src/ThemeBundle/Resources/views/Layout/menu.html.twig
index 43855caac7..70c498b6e3 100644
--- a/src/ThemeBundle/Resources/views/Layout/menu.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/menu.html.twig
@@ -64,17 +64,17 @@
                                 <div class="dropdown-divider"></div>
                                 <a title="{{ "Inbox"|trans }}" class="dropdown-item"
                                    href="{{ url('legacy_main', { 'name' : 'messages/inbox.php' }) }}">
-                                    <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
+                                    <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|trans }}
                                 </a>
 
                                 <a href="{{ url('legacy_main', { 'name' : 'survey/pending.php' }) }}" class="dropdown-item">
-                                    <em class="fa fa-chart-pie"></em> {{ 'PendingSurveys'|get_lang }}
+                                    <em class="fa fa-chart-pie"></em> {{ 'PendingSurveys'|trans }}
                                 </a>
 
                                 <a title="{{ "MyCertificates"|trans }}" class="dropdown-item"
                                    href="{{ url('legacy_main', { 'name' : 'gradebook/my_certificates.php' }) }}">
                                     <em class="fa fa-graduation-cap"
-                                        aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
+                                        aria-hidden="true"></em> {{ "MyCertificates"|trans }}
                                 </a>
 
                                 <a id="logout_button" title="{{ "Logout"|trans }}" class="dropdown-item"
diff --git a/src/ThemeBundle/Resources/views/Layout/sidebar.html.twig b/src/ThemeBundle/Resources/views/Layout/sidebar.html.twig
index de99ab3719..cb61aab8ff 100644
--- a/src/ThemeBundle/Resources/views/Layout/sidebar.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/sidebar.html.twig
@@ -8,19 +8,19 @@
     <li class="nav-item">
         <a class='sidebar-link' href="https://docs.chamilo.org/">
             <i class="far fa-file-alt"></i>
-            {{ "Documentation"|get_lang }}
+            {{ "Documentation"|trans }}
         </a>
     </li>
     <li class="nav-item">
         <a class='sidebar-link' href="https://forum.chamilo.org/">
             <i class="fa fa-users"></i>
-            {{ "Forums"|get_lang }}
+            {{ "Forums"|trans }}
         </a>
     </li>
     <li class="nav-item">
         <a class='sidebar-link' href="https://github.com/chamilo/chamilo-lms">
             <i class="fab fa-github"></i>
-            {{ "GithubRepository"|get_lang }}
+            {{ "GithubRepository"|trans }}
         </a>
     </li>
 </ul>
diff --git a/src/ThemeBundle/Resources/views/Layout/topbar.html.twig b/src/ThemeBundle/Resources/views/Layout/topbar.html.twig
index fb50ff742b..4ddff7cb09 100644
--- a/src/ThemeBundle/Resources/views/Layout/topbar.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/topbar.html.twig
@@ -244,19 +244,19 @@
                         <li>
                             <a title="{{ "Inbox"|trans }}" class="dropdown-item"
                                href="{{ url('legacy_main', { 'name' : 'messages/inbox.php' }) }}">
-                                <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
+                                <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|trans }}
                             </a>
                         </li>
                         <li>
                             <a href="{{ url('legacy_main', { 'name' : 'survey/pending.php' }) }}" class="dropdown-item">
-                                <em class="fa fa-chart-pie"></em> {{ 'PendingSurveys'|get_lang }}
+                                <em class="fa fa-chart-pie"></em> {{ 'PendingSurveys'|trans }}
                             </a>
                         </li>
                         <li>
                             <a title="{{ "MyCertificates"|trans }}" class="dropdown-item"
                                href="{{ url('legacy_main', { 'name' : 'gradebook/my_certificates.php' }) }}">
                                 <em class="fa fa-graduation-cap"
-                                    aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
+                                    aria-hidden="true"></em> {{ "MyCertificates"|trans }}
                             </a>
                         </li>
                         <li role="separator" class="divider"></li>
diff --git a/src/ThemeBundle/Resources/views/LearnPath/list.html.twig b/src/ThemeBundle/Resources/views/LearnPath/list.html.twig
index 07c52489d9..e230687fc3 100644
--- a/src/ThemeBundle/Resources/views/LearnPath/list.html.twig
+++ b/src/ThemeBundle/Resources/views/LearnPath/list.html.twig
@@ -3,7 +3,7 @@
 {% autoescape false %}
 <script>
     function confirmation(name) {
-        if (confirm("{{ "AreYouSureToDeleteJS"|get_lang }} \"" + name + "\" ?")) {
+        if (confirm("{{ "AreYouSureToDeleteJS"|trans }} \"" + name + "\" ?")) {
             return true;
         } else {
             return false;
@@ -30,68 +30,68 @@
                             {% if lp_data.category.getId() > 0 %}
                                 {% if not _c.session_id %}
                                     <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=add_lp_category&id=' ~ lp_data.category.getId() }}"
-                                       title="{{ "Edit"|get_lang }}">
-                                        <img src="{{ "edit.png"|icon }}" alt="{{ "Edit"|get_lang }}">
+                                       title="{{ "Edit"|trans }}">
+                                        <img src="{{ "edit.png"|icon }}" alt="{{ "Edit"|trans }}">
                                     </a>
 
                                     {% if subscription_settings.allow_add_users_to_lp_category %}
                                         <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=add_users_to_category&id=' ~ lp_data.category.getId() }}"
-                                           title="{{ "AddUsers"|get_lang }}">
-                                            <img src="{{ "user.png"|icon }}" alt="{{ "AddUsers"|get_lang }}">
+                                           title="{{ "AddUsers"|trans }}">
+                                            <img src="{{ "user.png"|icon }}" alt="{{ "AddUsers"|trans }}">
                                         </a>
                                     {% endif %}
 
                                     {% if loop.index0 == 1 %}
                                         <a href="#">
-                                            <img src="{{ "up_na.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                            <img src="{{ "up_na.png"|icon }}" alt="{{ "Move"|trans }}">
                                         </a>
                                     {% else %}
                                         <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=move_up_category&id=' ~ lp_data.category.getId() }}"
-                                           title="{{ "Move"|get_lang }}">
-                                            <img src="{{ "up.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                           title="{{ "Move"|trans }}">
+                                            <img src="{{ "up.png"|icon }}" alt="{{ "Move"|trans }}">
                                         </a>
                                     {% endif %}
 
                                     {% if (data|length - 1) == loop.index0 %}
                                         <a href="#">
-                                            <img src="{{ "down_na.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                            <img src="{{ "down_na.png"|icon }}" alt="{{ "Move"|trans }}">
                                         </a>
                                     {% else %}
                                         <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=move_down_category&id=' ~ lp_data.category.getId() }}"
-                                           title="{{ "Move"|get_lang }}">
-                                            <img src="{{ "down.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                           title="{{ "Move"|trans }}">
+                                            <img src="{{ "down.png"|icon }}" alt="{{ "Move"|trans }}">
                                         </a>
                                     {% endif %}
                                 {% endif %}
 
                                 {% if lp_data.category_visibility == 0 %}
                                     <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_visibility', 'id':lp_data.category.id, 'new_status':1}|url_encode }}"
-                                       title="{{ 'Show'|get_lang }}">
-                                        <img src="{{ 'invisible.png'|icon }}" alt="{{ 'Show'|get_lang }}">
+                                       title="{{ 'Show'|trans }}">
+                                        <img src="{{ 'invisible.png'|icon }}" alt="{{ 'Show'|trans }}">
                                     </a>
                                 {% else %}
                                     <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_visibility', 'id':lp_data.category.id, 'new_status':0}|url_encode }}"
-                                       title="{{ 'Hide'|get_lang }}">
-                                        <img src="{{ 'visible.png'|icon }}" alt="{{ 'Hide'|get_lang }}">
+                                       title="{{ 'Hide'|trans }}">
+                                        <img src="{{ 'visible.png'|icon }}" alt="{{ 'Hide'|trans }}">
                                     </a>
                                 {% endif %}
 
                                 {% if lp_data.category_is_published == 0 %}
                                     <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_publish', 'id':lp_data.category.id, 'new_status':1}|url_encode }}"
-                                       title="{{ 'LearnpathPublish'|get_lang }}">
+                                       title="{{ 'LearnpathPublish'|trans }}">
                                         <img src="{{ 'lp_publish_na.png'|icon }}"
-                                             alt="{{ 'LearnpathPublish'|get_lang }}">
+                                             alt="{{ 'LearnpathPublish'|trans }}">
                                     </a>
                                 {% else %}
                                     <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_publish', 'id':lp_data.category.id, 'new_status':0}|url_encode }}"
-                                       title="{{ 'LearnpathDoNotPublish'|get_lang }}">
-                                        <img src="{{ 'lp_publish.png'|icon }}" alt="{{ 'Hide'|get_lang }}">
+                                       title="{{ 'LearnpathDoNotPublish'|trans }}">
+                                        <img src="{{ 'lp_publish.png'|icon }}" alt="{{ 'Hide'|trans }}">
                                     </a>
                                 {% endif %}
                                 {% if not _c.session_id %}
                                     <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query  ~ '&action=delete_lp_category&id=' ~ lp_data.category.getId() }}"
-                                       title="{{ "Delete"|get_lang }}">
-                                        <img src="{{ "delete.png"|icon }}" alt="{{ "Delete"|get_lang }}">
+                                       title="{{ "Delete"|trans }}">
+                                        <img src="{{ "delete.png"|icon }}" alt="{{ "Delete"|trans }}">
                                     </a>
                                 {% endif %}
                             {% endif %}
@@ -106,17 +106,17 @@
                         <table class="table table-hover table-striped">
                             <thead>
                             <tr>
-                                <th>{{ "Title"|get_lang }}</th>
+                                <th>{{ "Title"|trans }}</th>
                                 {% if is_allowed_to_edit %}
-                                    <th>{{ "PublicationDate"|get_lang }}</th>
-                                    <th>{{ "ExpirationDate"|get_lang }}</th>
-                                    <th>{{ "Progress"|get_lang }}</th>
-                                    <th>{{ "AuthoringOptions"|get_lang }}</th>
+                                    <th>{{ "PublicationDate"|trans }}</th>
+                                    <th>{{ "ExpirationDate"|trans }}</th>
+                                    <th>{{ "Progress"|trans }}</th>
+                                    <th>{{ "AuthoringOptions"|trans }}</th>
                                 {% else %}
                                     {% if not is_invitee %}
-                                        <th>{{ "Progress"|get_lang }}</th>
+                                        <th>{{ "Progress"|trans }}</th>
                                     {% endif %}
-                                    <th>{{ "Actions"|get_lang }}</th>
+                                    <th>{{ "Actions"|trans }}</th>
                                 {% endif %}
                             </tr>
                             </thead>
@@ -186,18 +186,18 @@
                                 <table class="table table-hover table-striped">
                                     <thead>
                                     <tr>
-                                        <th>{{ "Title"|get_lang }}</th>
+                                        <th>{{ "Title"|trans }}</th>
                                         {% if is_allowed_to_edit %}
-                                            <th>{{ "PublicationDate"|get_lang }}</th>
-                                            <th>{{ "ExpirationDate"|get_lang }}</th>
-                                            <th>{{ "Progress"|get_lang }}</th>
-                                            <th>{{ "AuthoringOptions"|get_lang }}</th>
+                                            <th>{{ "PublicationDate"|trans }}</th>
+                                            <th>{{ "ExpirationDate"|trans }}</th>
+                                            <th>{{ "Progress"|trans }}</th>
+                                            <th>{{ "AuthoringOptions"|trans }}</th>
                                         {% else %}
                                             {% if not is_invitee %}
-                                                <th>{{ "Progress"|get_lang }}</th>
+                                                <th>{{ "Progress"|trans }}</th>
                                             {% endif %}
 
-                                            <th>{{ "Actions"|get_lang }}</th>
+                                            <th>{{ "Actions"|trans }}</th>
                                         {% endif %}
                                     </tr>
                                     </thead>
@@ -293,74 +293,74 @@
                                     {% if lp_data.category.getId() > 0 %}
                                         {% if not _c.session_id %}
                                             <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=add_lp_category&id=' ~ lp_data.category.getId() }}"
-                                               title="{{ "Edit"|get_lang }}">
-                                                <img src="{{ "edit.png"|icon }}" alt="{{ "Edit"|get_lang }}">
+                                               title="{{ "Edit"|trans }}">
+                                                <img src="{{ "edit.png"|icon }}" alt="{{ "Edit"|trans }}">
                                             </a>
 
                                             {% if subscription_settings.allow_add_users_to_lp_category %}
                                                 <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=add_users_to_category&id=' ~ lp_data.category.getId() }}"
-                                                   title="{{ "AddUsers"|get_lang }}">
-                                                    <img src="{{ "user.png"|icon }}" alt="{{ "AddUsers"|get_lang }}">
+                                                   title="{{ "AddUsers"|trans }}">
+                                                    <img src="{{ "user.png"|icon }}" alt="{{ "AddUsers"|trans }}">
                                                 </a>
                                             {% endif %}
 
                                             {% if loop.index0 == 1 %}
                                                 <a href="#">
-                                                    <img src="{{ "up_na.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                                    <img src="{{ "up_na.png"|icon }}" alt="{{ "Move"|trans }}">
                                                 </a>
                                             {% else %}
                                                 <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=move_up_category&id=' ~ lp_data.category.getId() }}"
-                                                   title="{{ "Move"|get_lang }}">
-                                                    <img src="{{ "up.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                                   title="{{ "Move"|trans }}">
+                                                    <img src="{{ "up.png"|icon }}" alt="{{ "Move"|trans }}">
                                                 </a>
                                             {% endif %}
 
                                             {% if (data|length - 1) == loop.index0 %}
                                                 <a href="#">
-                                                    <img src="{{ "down_na.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                                    <img src="{{ "down_na.png"|icon }}" alt="{{ "Move"|trans }}">
                                                 </a>
                                             {% else %}
                                                 <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query ~ '&action=move_down_category&id=' ~ lp_data.category.getId() }}"
-                                                   title="{{ "Move"|get_lang }}">
-                                                    <img src="{{ "down.png"|icon }}" alt="{{ "Move"|get_lang }}">
+                                                   title="{{ "Move"|trans }}">
+                                                    <img src="{{ "down.png"|icon }}" alt="{{ "Move"|trans }}">
                                                 </a>
                                             {% endif %}
                                         {% endif %}
 
                                         {% if lp_data.category_visibility == 0 %}
                                             <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_visibility', 'id':lp_data.category.id, 'new_status':1}|url_encode }}"
-                                               title="{{ 'Show'|get_lang }}">
-                                                <img src="{{ 'invisible.png'|icon }}" alt="{{ 'Show'|get_lang }}">
+                                               title="{{ 'Show'|trans }}">
+                                                <img src="{{ 'invisible.png'|icon }}" alt="{{ 'Show'|trans }}">
                                             </a>
                                         {% else %}
                                             <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_visibility', 'id':lp_data.category.id, 'new_status':0}|url_encode }}"
-                                               title="{{ 'Hide'|get_lang }}">
-                                                <img src="{{ 'visible.png'|icon }}" alt="{{ 'Hide'|get_lang }}">
+                                               title="{{ 'Hide'|trans }}">
+                                                <img src="{{ 'visible.png'|icon }}" alt="{{ 'Hide'|trans }}">
                                             </a>
                                         {% endif %}
 
                                         {% if lp_data.category_visibility == 1 %}
                                             {% if lp_data.category_is_published == 0 %}
                                                 <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_publish', 'id':lp_data.category.id, 'new_status':1}|url_encode }}"
-                                                   title="{{ 'LearnpathPublish'|get_lang }}">
+                                                   title="{{ 'LearnpathPublish'|trans }}">
                                                     <img src="{{ 'lp_publish_na.png'|icon }}"
-                                                         alt="{{ 'LearnpathPublish'|get_lang }}">
+                                                         alt="{{ 'LearnpathPublish'|trans }}">
                                                 </a>
                                             {% else %}
                                                 <a href="lp_controller.php?{{ _p.web_cid_query ~ '&' ~ {'action':'toggle_category_publish', 'id':lp_data.category.id, 'new_status':0}|url_encode }}"
-                                                   title="{{ 'LearnpathDoNotPublish'|get_lang }}">
-                                                    <img src="{{ 'lp_publish.png'|icon }}" alt="{{ 'Hide'|get_lang }}">
+                                                   title="{{ 'LearnpathDoNotPublish'|trans }}">
+                                                    <img src="{{ 'lp_publish.png'|icon }}" alt="{{ 'Hide'|trans }}">
                                                 </a>
                                             {% endif %}
                                         {% else %}
                                             <img src="{{ 'lp_publish_na.png'|icon }}"
-                                                 alt="{{ 'LearnpathPublish'|get_lang }}">
+                                                 alt="{{ 'LearnpathPublish'|trans }}">
                                         {% endif %}
 
                                         {% if not _c.session_id %}
                                             <a href="{{ 'lp_controller.php?' ~ _p.web_cid_query  ~ '&action=delete_lp_category&id=' ~ lp_data.category.getId() }}"
-                                               title="{{ "Delete"|get_lang }}">
-                                                <img src="{{ "delete.png"|icon }}" alt="{{ "Delete"|get_lang }}">
+                                               title="{{ "Delete"|trans }}">
+                                                <img src="{{ "delete.png"|icon }}" alt="{{ "Delete"|trans }}">
                                             </a>
                                         {% endif %}
                                     {% endif %}
@@ -385,18 +385,18 @@
                                             <table class="table table-hover table-striped">
                                                 <thead>
                                                 <tr>
-                                                    <th>{{ "Title"|get_lang }}</th>
+                                                    <th>{{ "Title"|trans }}</th>
                                                     {% if is_allowed_to_edit %}
-                                                        <th>{{ "PublicationDate"|get_lang }}</th>
-                                                        <th>{{ "ExpirationDate"|get_lang }}</th>
-                                                        <th>{{ "Progress"|get_lang }}</th>
-                                                        <th>{{ "AuthoringOptions"|get_lang }}</th>
+                                                        <th>{{ "PublicationDate"|trans }}</th>
+                                                        <th>{{ "ExpirationDate"|trans }}</th>
+                                                        <th>{{ "Progress"|trans }}</th>
+                                                        <th>{{ "AuthoringOptions"|trans }}</th>
                                                     {% else %}
                                                         {% if not is_invitee %}
-                                                            <th>{{ "Progress"|get_lang }}</th>
+                                                            <th>{{ "Progress"|trans }}</th>
                                                         {% endif %}
 
-                                                        <th>{{ "Actions"|get_lang }}</th>
+                                                        <th>{{ "Actions"|trans }}</th>
                                                     {% endif %}
                                                 </tr>
                                                 </thead>
@@ -490,11 +490,11 @@
 </div>
 {% if is_allowed_to_edit and not lp_is_shown %}
     <div id="no-data-view">
-        <h2>{{ "LearningPaths"|get_lang }}</h2>
+        <h2>{{ "LearningPaths"|trans }}</h2>
         <img src="{{ "scorms.png"|icon(64) }}" width="64" height="64">
         <div class="controls">
             <a href="{{ web_self ~ "?" ~ _p.web_cid_query ~ "&action=add_lp" }}" class="btn btn-default">
-                {{ "LearnpathAddLearnpath"|get_lang }}
+                {{ "LearnpathAddLearnpath"|trans }}
             </a>
         </div>
     </div>
diff --git a/src/ThemeBundle/Resources/views/LearnPath/record_voice.html.twig b/src/ThemeBundle/Resources/views/LearnPath/record_voice.html.twig
index ebd9494182..707baf79cc 100644
--- a/src/ThemeBundle/Resources/views/LearnPath/record_voice.html.twig
+++ b/src/ThemeBundle/Resources/views/LearnPath/record_voice.html.twig
@@ -1,13 +1,13 @@
 <div id="record-audio-recordrtc" class="text-center">
     <p>
         <span class="fa fa-microphone fa-5x fa-fw" aria-hidden="true"></span>
-        <span class="sr-only">{{ 'RecordAudio'|get_lang }}</span>
+        <span class="sr-only">{{ 'RecordAudio'|trans }}</span>
     </p>
     <button class="btn btn-primary" type="button" id="btn-start-record">
-        <span class="fa fa-circle fa-fw" aria-hidden="true"></span> {{ 'StartRecordingAudio'|get_lang }}
+        <span class="fa fa-circle fa-fw" aria-hidden="true"></span> {{ 'StartRecordingAudio'|trans }}
     </button>
     <button class="btn btn-success" type="button" id="btn-stop-record" disabled>
-        <span class="fa fa-square fa-fw" aria-hidden="true"></span> {{ 'StopRecordingAudio'|get_lang }}
+        <span class="fa fa-square fa-fw" aria-hidden="true"></span> {{ 'StopRecordingAudio'|trans }}
     </button>
 </div>
 
diff --git a/src/ThemeBundle/Resources/views/LearnPath/report.html.twig b/src/ThemeBundle/Resources/views/LearnPath/report.html.twig
index ed81137639..6a0224a8d6 100644
--- a/src/ThemeBundle/Resources/views/LearnPath/report.html.twig
+++ b/src/ThemeBundle/Resources/views/LearnPath/report.html.twig
@@ -2,17 +2,17 @@
     <table class="table table-hover table-striped table-bordered">
         <thead>
         <tr>
-            <th>{{ 'FirstName'|get_lang }}</th>
-            <th>{{ 'LastName'|get_lang }}</th>
+            <th>{{ 'FirstName'|trans }}</th>
+            <th>{{ 'LastName'|trans }}</th>
             {% if show_email %}
-                <th>{{ 'Email'|get_lang }}</th>
+                <th>{{ 'Email'|trans }}</th>
             {% endif %}
-            <th class="text-center">{{ 'ScormTime'|get_lang }}</th>
-            <th class="text-right">{{ 'Progress'|get_lang }}</th>
-            <th class="text-right">{{ 'ScormScore'|get_lang }}</th>
-            <th class="text-center">{{ 'LastConnection'|get_lang }}</th>
+            <th class="text-center">{{ 'ScormTime'|trans }}</th>
+            <th class="text-right">{{ 'Progress'|trans }}</th>
+            <th class="text-right">{{ 'ScormScore'|trans }}</th>
+            <th class="text-center">{{ 'LastConnection'|trans }}</th>
             {% if not export %}
-                <th>{{ 'Actions'|get_lang }}</th>
+                <th>{{ 'Actions'|trans }}</th>
             {% endif %}
         </tr>
         </thead>
@@ -30,7 +30,7 @@
                 <td class="text-center">{{ user.lp_last_connection }}</td>
                 {% if not export %}
                     <td>
-                        <button class="btn btn-primary btn-sm" data-id="{{ user.id }}">{{ 'Details'|get_lang }}</button>
+                        <button class="btn btn-primary btn-sm" data-id="{{ user.id }}">{{ 'Details'|trans }}</button>
                     </td>
                 {% endif %}
             </tr>
diff --git a/src/ThemeBundle/Resources/views/LearnPath/view.html.twig b/src/ThemeBundle/Resources/views/LearnPath/view.html.twig
index be8ab55633..ba8074df48 100644
--- a/src/ThemeBundle/Resources/views/LearnPath/view.html.twig
+++ b/src/ThemeBundle/Resources/views/LearnPath/view.html.twig
@@ -47,7 +47,7 @@
                                         {% endif %}
                                     </div>
                                     <div class="col-xs-6 text-right">
-                                        {{ "XPoints"|get_lang|format(gamification_points) }}
+                                        {{ "XPoints"|trans|format(gamification_points) }}
                                     </div>
                                 </div>
                                 <div class="row">
@@ -79,18 +79,18 @@
 
     <div id="lp_navigation_elem" class="navegation-bar">
         {% if show_left_column == 1 %}
-            <a href="#" title = "{{ 'Expand'|get_lang }}" id="lp-view-expand-toggle" class="icon-toolbar expand" role="button">
+            <a href="#" title = "{{ 'Expand'|trans }}" id="lp-view-expand-toggle" class="icon-toolbar expand" role="button">
                 {% if lp_mode == 'embedframe' %}
                     <span class="fa fa-compress" aria-hidden="true"></span>
-                    <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                    <span class="sr-only">{{ 'Expand'|trans }}</span>
                 {% else %}
                     <span class="fa fa-expand" aria-hidden="true"></span>
-                    <span class="sr-only">{{ 'Expand'|get_lang }}</span>
+                    <span class="sr-only">{{ 'Expand'|trans }}</span>
                 {% endif %}
             </a>
         {% endif %}
 
-        <a id="home-course" title = "{{ 'Home'|get_lang }}" href="{{ button_home_url }}" class="icon-toolbar" target="_self" onclick="javascript: window.parent.API.save_asset();">
+        <a id="home-course" title = "{{ 'Home'|trans }}" href="{{ button_home_url }}" class="icon-toolbar" target="_self" onclick="javascript: window.parent.API.save_asset();">
             <em class="fa fa-home"></em> <span class="hidden-xs hidden-sm"></span>
         </a>
         {{ navigation_bar }}
@@ -103,15 +103,15 @@
                 <div id="navTabsbar" class="nav-tabs-bar">
                     <ul id="navTabs" class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active">
-                            <a href="#lp-view-content" title="{{ 'Lesson'|get_lang }}" aria-controls="lp-view-content" role="tab" data-toggle="tab">
+                            <a href="#lp-view-content" title="{{ 'Lesson'|trans }}" aria-controls="lp-view-content" role="tab" data-toggle="tab">
                                 <span class="fa fa-book fa-2x fa-fw" aria-hidden="true"></span>
-                                <span class="sr-only">{{ 'Lesson'|get_lang }}</span>
+                                <span class="sr-only">{{ 'Lesson'|trans }}</span>
                             </a>
                         </li>
                         <li role="presentation">
-                            <a href="#lp-view-forum" title="{{ 'Forum'|get_lang }}" aria-controls="lp-view-forum" role="tab" data-toggle="tab">
+                            <a href="#lp-view-forum" title="{{ 'Forum'|trans }}" aria-controls="lp-view-forum" role="tab" data-toggle="tab">
                                 <span class="fa fa-commenting-o fa-2x fa-fw" aria-hidden="true"></span>
-                                <span class="sr-only">{{ 'Forum'|get_lang }}</span>
+                                <span class="sr-only">{{ 'Forum'|trans }}</span>
                             </a>
                         </li>
                     </ul>
@@ -176,9 +176,9 @@
                 $('#lp-view-expand-toggle span.fa').toggleClass('fa-expand');
                 var className = $('#lp-view-expand-toggle span.fa').attr('class');
                 if (className == 'fa fa-expand') {
-                    $(this).attr('title', '{{ "Expand" | get_lang }}');
+                    $(this).attr('title', '{{ "Expand" | trans }}');
                 } else {
-                    $(this).attr('title', '{{ "Collapse" | get_lang }}');
+                    $(this).attr('title', '{{ "Collapse" | trans }}');
                 }
 
                 if($('#navTabsbar').is(':hidden')){
@@ -199,9 +199,9 @@
 
                 var className = $('#lp-view-expand-toggle span.fa').attr('class');
                 if (className == 'fa fa-expand') {
-                    $(this).attr('title', '{{ "Expand" | get_lang }}');
+                    $(this).attr('title', '{{ "Expand" | trans }}');
                 } else {
-                    $(this).attr('title', '{{ "Collapse" | get_lang }}');
+                    $(this).attr('title', '{{ "Collapse" | trans }}');
                 }
 
                 if($('#navTabsbar').is(':hidden')){
diff --git a/src/ThemeBundle/Resources/views/Mailer/Exercise/result_alert_body.html.twig b/src/ThemeBundle/Resources/views/Mailer/Exercise/result_alert_body.html.twig
index d465d6b505..86a1d02d8d 100644
--- a/src/ThemeBundle/Resources/views/Mailer/Exercise/result_alert_body.html.twig
+++ b/src/ThemeBundle/Resources/views/Mailer/Exercise/result_alert_body.html.twig
@@ -1,19 +1,19 @@
 <div id="email-message" style="padding-top:10px; padding-bottom:10px;">
-    <p><strong>{{ 'DearStudentEmailIntroduction'|get_lang }}</strong> {{ 'AttemptVCC'|get_lang }} </p>
+    <p><strong>{{ 'DearStudentEmailIntroduction'|trans }}</strong> {{ 'AttemptVCC'|trans }} </p>
     <div style="border-color: #bce8f1; padding: 15px; background-color: #d9edf7; margin-bottom: 15px; font-size: 16px; color:#31708f;">
         <p>
-            <strong>{{ 'CourseName'|get_lang }}: </strong>
+            <strong>{{ 'CourseName'|trans }}: </strong>
             {{ course_title }}
             <br>
-            <strong>{{ 'Exercise'|get_lang }}: </strong>
+            <strong>{{ 'Exercise'|trans }}: </strong>
             {{ test_title }}
         </p>
     </div>
 
-    <p>{{ 'ClickLinkToViewComment'|get_lang }}</p>
+    <p>{{ 'ClickLinkToViewComment'|trans }}</p>
     <p><a style="font-weight: bold; color: #2BA6CB;" href="{{ url }}">{{ url }}</a></p>
     <div style="text-align: right;">
-        <p><strong>{{ 'Regards'|get_lang }}</strong><br>
+        <p><strong>{{ 'Regards'|trans }}</strong><br>
             {{ teacher_name }}</p>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/ThemeBundle/Resources/views/Navbar/user.html.twig b/src/ThemeBundle/Resources/views/Navbar/user.html.twig
index 88832634bc..7337e8a3d5 100644
--- a/src/ThemeBundle/Resources/views/Navbar/user.html.twig
+++ b/src/ThemeBundle/Resources/views/Navbar/user.html.twig
@@ -25,10 +25,10 @@
             {{ url('home') }}
 
             <a title="{{ "Inbox"|trans }}" href="{{ url('legacy_main', { 'name' : 'messages/inbox.php' }) }}">
-                <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
+                <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|trans }}
             </a>
             <a title="{{ "MyCertificates"|trans }}" href="{{ url('legacy_main', { 'name' : 'gradebook/my_certificates.php' })  }}">
-                <em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
+                <em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|trans }}
             </a>
             <a id="logout_button" title="{{ "Logout"|trans }}" href="{{ path('legacy_main', { 'name' : '../public/logout'}) }}" >
                 <em class="fa fa-sign-out"></em> {{ "Logout"|trans }}
diff --git a/src/ThemeBundle/Resources/views/News/slider.html.twig b/src/ThemeBundle/Resources/views/News/slider.html.twig
index 57471a7677..3ac86d1126 100644
--- a/src/ThemeBundle/Resources/views/News/slider.html.twig
+++ b/src/ThemeBundle/Resources/views/News/slider.html.twig
@@ -9,7 +9,7 @@
         {% endif %}
     {% endset %}
     {% set content %}
-   {{ macro.box_header("SystemAnnouncements" | get_lang, buttons) }}
+   {{ macro.box_header("SystemAnnouncements" | trans, buttons) }}
     <div id="carousel-announcement" class="carousel slide" data-ride="carousel">
         <ol class="carousel-indicators">
             {% for announcement in announcements %}
@@ -23,7 +23,7 @@
                     {% if announcement.readMore %}
                         <div class="block-text">
                             {{ announcement.content }}
-                            <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
+                            <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | trans }}</a>
                         </div>
                     {% else %}
                         {{ announcement.content }}
diff --git a/src/ThemeBundle/Resources/views/News/view.html.twig b/src/ThemeBundle/Resources/views/News/view.html.twig
index c2bfa32957..fbf8400ccc 100644
--- a/src/ThemeBundle/Resources/views/News/view.html.twig
+++ b/src/ThemeBundle/Resources/views/News/view.html.twig
@@ -3,7 +3,7 @@
 {% block content %}
     {% autoescape false %}
         <div class="page-header">
-            <h4>{{ "SystemAnnouncements" | get_lang }}</h4>
+            <h4>{{ "SystemAnnouncements" | trans }}</h4>
         </div>
 
         {% if not announcement is empty %}
@@ -15,7 +15,7 @@
             </article>
         {% else %}
             <div class="alert alert-danger" role="alert">
-                {{ "NoResults" | get_lang }}
+                {{ "NoResults" | trans }}
             </div>
         {% endif %}
     {% endautoescape %}
diff --git a/src/ThemeBundle/Resources/views/Online/index.html.twig b/src/ThemeBundle/Resources/views/Online/index.html.twig
index 26283ccc3c..86e86e24cd 100644
--- a/src/ThemeBundle/Resources/views/Online/index.html.twig
+++ b/src/ThemeBundle/Resources/views/Online/index.html.twig
@@ -8,7 +8,7 @@
                     <div class="search-user">
                         <div class="panel panel-default">
                             <div class="panel-heading">
-                                {{ 'SearchUsers' | get_lang}}
+                                {{ 'SearchUsers' | trans}}
                             </div>
                             <div class="panel-body">
                                 {{ social_search }}
@@ -21,7 +21,7 @@
                         {{ whoisonline }}
                     </div>
                     <div class="col-md-12">
-                        <a class="btn btn-large btn-default" id="link_load_more_items" data_link="2" >{{ 'More' | get_lang }}</a>
+                        <a class="btn btn-large btn-default" id="link_load_more_items" data_link="2" >{{ 'More' | trans }}</a>
                     </div>
                 </div>
             </div>
@@ -32,7 +32,7 @@
                     page = $("#link_load_more_items").attr("data_link");
                     $.ajax({
                         beforeSend: function() {
-                            $("#link_load_more_items").html("{{ 'Loading' | get_lang|escape('js') }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
+                            $("#link_load_more_items").html("{{ 'Loading' | trans|escape('js') }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
                         },
                         type: "GET",
                         url: "main/inc/ajax/online.ajax.php?a=load_online_user",
@@ -41,7 +41,7 @@
                             if (data != "end") {
                                 $("#link_load_more_items").attr("data_link", parseInt(page) + 1);
                                 $("#user-list").append(data);
-                                $("#link_load_more_items").html("{{ 'More' | get_lang|escape('js')}}");
+                                $("#link_load_more_items").html("{{ 'More' | trans|escape('js')}}");
                             } else {
                                 $("#link_load_more_items").remove();
                             }
diff --git a/src/ThemeBundle/Resources/views/Online/online_users_in_course.html.twig b/src/ThemeBundle/Resources/views/Online/online_users_in_course.html.twig
index 26283ccc3c..86e86e24cd 100644
--- a/src/ThemeBundle/Resources/views/Online/online_users_in_course.html.twig
+++ b/src/ThemeBundle/Resources/views/Online/online_users_in_course.html.twig
@@ -8,7 +8,7 @@
                     <div class="search-user">
                         <div class="panel panel-default">
                             <div class="panel-heading">
-                                {{ 'SearchUsers' | get_lang}}
+                                {{ 'SearchUsers' | trans}}
                             </div>
                             <div class="panel-body">
                                 {{ social_search }}
@@ -21,7 +21,7 @@
                         {{ whoisonline }}
                     </div>
                     <div class="col-md-12">
-                        <a class="btn btn-large btn-default" id="link_load_more_items" data_link="2" >{{ 'More' | get_lang }}</a>
+                        <a class="btn btn-large btn-default" id="link_load_more_items" data_link="2" >{{ 'More' | trans }}</a>
                     </div>
                 </div>
             </div>
@@ -32,7 +32,7 @@
                     page = $("#link_load_more_items").attr("data_link");
                     $.ajax({
                         beforeSend: function() {
-                            $("#link_load_more_items").html("{{ 'Loading' | get_lang|escape('js') }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
+                            $("#link_load_more_items").html("{{ 'Loading' | trans|escape('js') }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
                         },
                         type: "GET",
                         url: "main/inc/ajax/online.ajax.php?a=load_online_user",
@@ -41,7 +41,7 @@
                             if (data != "end") {
                                 $("#link_load_more_items").attr("data_link", parseInt(page) + 1);
                                 $("#user-list").append(data);
-                                $("#link_load_more_items").html("{{ 'More' | get_lang|escape('js')}}");
+                                $("#link_load_more_items").html("{{ 'More' | trans|escape('js')}}");
                             } else {
                                 $("#link_load_more_items").remove();
                             }
diff --git a/src/ThemeBundle/Resources/views/Social/user_block.html.twig b/src/ThemeBundle/Resources/views/Social/user_block.html.twig
index 9a04eb607e..17146578eb 100644
--- a/src/ThemeBundle/Resources/views/Social/user_block.html.twig
+++ b/src/ThemeBundle/Resources/views/Social/user_block.html.twig
@@ -12,21 +12,21 @@
         {% if is_granted('ROLE_ADMIN') %}
             <li class="item">
                 <a href="{{ _p.web }}main/admin/user_edit.php?user_id={{ user.id }}">
-                    <img src="{{ "edit.png" | icon }}" alt="{{ "Edit" | get_lang }}">
+                    <img src="{{ "edit.png" | icon }}" alt="{{ "Edit" | trans }}">
                 </a>
             </li>
         {% endif %}
         {% if show_full_profile %}
             <li class="item">
                 <a href="{{ _p.web }}main/messages/new_message.php">
-                    <img src="{{ "instant_message.png" | icon }}" alt="{{ "Email" | get_lang }}">
+                    <img src="{{ "instant_message.png" | icon }}" alt="{{ "Email" | trans }}">
                     {{ user.email}}
                 </a>
             </li>
             <li class="item">
                 <a href="{{ vcard_user_link }}">
-                    <img src="{{ "vcard.png" | icon(16) }}" alt="{{ "BusinessCard" | get_lang }}" width="16" height="16">
-                    {{ "BusinessCard" | get_lang }}
+                    <img src="{{ "vcard.png" | icon(16) }}" alt="{{ "BusinessCard" | trans }}" width="16" height="16">
+                    {{ "BusinessCard" | trans }}
                 </a>
             </li>
 
@@ -45,7 +45,7 @@
             {% if 'allow_show_skype_account'|api_get_setting == 'true' and not skype_account is empty %}
                 <li class="item">
                     <a href="skype:{{ skype_account }}?chat">
-                        <span class="fa fa-skype fa-fw" aria-hidden="true"></span> {{ 'Skype'|get_lang }}
+                        <span class="fa fa-skype fa-fw" aria-hidden="true"></span> {{ 'Skype'|trans }}
                     </a>
                 </li>
             {% endif %}
@@ -53,7 +53,7 @@
             {% if 'allow_show_linkedin_url'|api_get_setting == 'true' and not linkedin_url is empty %}
                 <li class="item">
                     <a href="{{ linkedin_url }}" target="_blank">
-                        <span class="fa fa-linkedin fa-fw" aria-hidden="true"></span> {{ 'LinkedIn'|get_lang }}
+                        <span class="fa fa-linkedin fa-fw" aria-hidden="true"></span> {{ 'LinkedIn'|trans }}
                     </a>
                 </li>
             {% endif %}
@@ -63,13 +63,13 @@
                 {% if user_relation == user_relation_type_friend %}
                     <li class="item">
                         <a onclick="javascript:chatWith('{{ user.id }}', '{{ user.complete_name }}', '{{ user.user_is_online }}','{{ user.avatar_small }}')" href="javascript:void(0);">
-                            <img src="{{ "online.png" | icon }}" alt="{{ "Online" | get_lang }}">
-                            {{ "Chat" | get_lang }} ({{ "Online" | get_lang }})
+                            <img src="{{ "online.png" | icon }}" alt="{{ "Online" | trans }}">
+                            {{ "Chat" | trans }} ({{ "Online" | trans }})
                         </a>
                     </li>
                     {# else #}
-                    {# <img src="{{ "offline.png" | icon }}" alt="{{ "Online" | get_lang }}"> #}
-                    {# {{ "Chat" | get_lang }} ({{ "Offline" | get_lang }}) #}
+                    {# <img src="{{ "offline.png" | icon }}" alt="{{ "Online" | trans }}"> #}
+                    {# {{ "Chat" | trans }} ({{ "Offline" | trans }}) #}
                 {% endif %}
             {% endif %}
         {% endif %}
@@ -77,12 +77,12 @@
         {% if not profile_edition_link is empty %}
             <li class="item">
                 <a class="btn btn-link btn-sm btn-block" href="{{ profile_edition_link }}">
-                    <em class="fa fa-edit"></em>{{ "EditProfile" | get_lang }}
+                    <em class="fa fa-edit"></em>{{ "EditProfile" | trans }}
                 </a>
             </li>
         {% endif %}
     </ul>
 {% endset %}
-{{ macro.panel("Profile" | get_lang, profile_body ) }}
+{{ macro.panel("Profile" | trans, profile_body ) }}
 </div>
 {% endautoescape %}
diff --git a/src/ThemeBundle/Resources/views/default/layout/hot_course_item.html.twig b/src/ThemeBundle/Resources/views/default/layout/hot_course_item.html.twig
index b5f13d8a21..c38d4c7023 100644
--- a/src/ThemeBundle/Resources/views/default/layout/hot_course_item.html.twig
+++ b/src/ThemeBundle/Resources/views/default/layout/hot_course_item.html.twig
@@ -28,8 +28,8 @@
                 <div class="card-author mb-2">
                     <i class="fa fa-graduation-cap" aria-hidden="true"></i>
                     {% if item.teachers | length >= 3 %}
-                        <a id="plist-{{ loop.index }}" data-trigger="focus" tabindex="0" role="button" class="list-name" data-toggle="popover" title="{{ 'CourseTeachers' | get_lang }}" data-html="true">
-                            {{ 'CourseTeachers' | get_lang }}
+                        <a id="plist-{{ loop.index }}" data-trigger="focus" tabindex="0" role="button" class="list-name" data-toggle="popover" title="{{ 'CourseTeachers' | trans }}" data-html="true">
+                            {{ 'CourseTeachers' | trans }}
                         </a>
                         <div id="popover-content-plist-{{ loop.index }}" style="display: none;">
                             {% for teacher in item.teachers %}
diff --git a/src/ThemeBundle/Resources/views/default/layout/hot_courses.html.twig b/src/ThemeBundle/Resources/views/default/layout/hot_courses.html.twig
index be428b5682..3beac59908 100644
--- a/src/ThemeBundle/Resources/views/default/layout/hot_courses.html.twig
+++ b/src/ThemeBundle/Resources/views/default/layout/hot_courses.html.twig
@@ -6,16 +6,16 @@
             $(document).ready(function () {
                 $('.star-rating li a').on('click', function (event) {
                     var id = $(this).parents('ul').attr('id');
-                    $('#vote_label2_' + id).html("{{ 'Loading'|get_lang }}");
+                    $('#vote_label2_' + id).html("{{ 'Loading'|trans }}");
                     $.ajax({
                         url: $(this).attr('data-link'),
                         success: function (data) {
                             $("#rating_wrapper_" + id).html(data);
                             if (data == 'added') {
-                                //$('#vote_label2_' + id).html("{{ 'Saved'|get_lang }}");
+                                //$('#vote_label2_' + id).html("{{ 'Saved'|trans }}");
                             }
                             if (data == 'updated') {
-                                //$('#vote_label2_' + id).html("{{ 'Saved'|get_lang }}");
+                                //$('#vote_label2_' + id).html("{{ 'Saved'|trans }}");
                             }
                         }
                     });
@@ -25,7 +25,7 @@
 
         {% set buttons %}
             {% if is_granted('ROLE_ADMIN') %}
-                <a title="{{ "Hide"|get_lang }}"
+                <a title="{{ "Hide"|trans }}"
                    class="btn btn-light btn-sm"
                    href="{{ url('admin_settings') }}/search_settings?keyword=show_hot_courses&submit_button=&_qf__search_settings=&category=search_setting"
                 >
@@ -35,7 +35,7 @@
         {% endset %}
 
         {% set content %}
-            {{ macro.box_header("HottestCourses" | get_lang, buttons) }}
+            {{ macro.box_header("HottestCourses" | trans, buttons) }}
             <div class="row">
                 {% include '@ChamiloTheme/default/layout/hot_course_item.html.twig' %}
             </div>
diff --git a/tests/scripts/migrate_item_property.php b/tests/scripts/migrate_item_property.php
index e62657bb71..5087a19e99 100644
--- a/tests/scripts/migrate_item_property.php
+++ b/tests/scripts/migrate_item_property.php
@@ -178,9 +178,9 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
                     $media->setSize($documentData['size']);
                     $media->setContext('default');
 
-                    $provider = 'sonata.media.provider.image';
-                    if (!in_array($extension, ['jpeg', 'jpg', 'gif', 'png'])) {
-                        $provider = 'sonata.media.provider.file';
+                    $provider = 'sonata.media.provider.file';
+                    if (in_array($extension, ['jpeg', 'jpg', 'gif', 'png'])) {
+                        $provider = 'sonata.media.provider.image';
                     }
 
                     $media->setProviderName($provider);