diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 8ba644d0ff..9ffc718d14 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -5633,6 +5633,10 @@ a.sessionView {
     text-align:center;
     vertical-align:middle;
 }
+#gradebook_list .score{
+    font-weight: bold;
+    color: #8A6E4E;
+}
 #gradebook_list .centered .badge-group {
     width: auto;
 }
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index a36dac4680..7d395deee7 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -755,7 +755,7 @@ $no_qualification = false;
 // Show certificate link.
 $certificate = array();
 
-echo '<div class="actions" align="right">';
+$actionsLeft = '';
 
 if ($category != '0') {
     $cat = new Category();
@@ -771,7 +771,7 @@ if ($category != '0') {
                 $stud_id
             );
             if (isset($certificate['pdf_url'])) {
-                echo Display::url(
+                $actionsLeft .= Display::url(Display::returnFontAswesomeIcon('file-pdf-o') . 
                     get_lang('DownloadCertificatePdf'),
                     $certificate['pdf_url'],
                     ['class' => 'btn btn-default']
@@ -785,14 +785,14 @@ if ($category != '0') {
 }
 
 if (!api_is_allowed_to_edit(null, true)) {
-    echo Display::url(
-        get_lang('DownloadReportPdf'),
-        api_get_self()."?".api_get_self()."&action=export_table",
-        ['class' => 'btn btn-default']
+    $actionsLeft .= Display::url(
+            Display::returnFontAswesomeIcon('file-pdf-o') . get_lang('DownloadReportPdf'),
+            api_get_self()."?".api_get_self()."&action=export_table",
+            ['class' => 'btn btn-default']
     );
 }
 
-echo '</div>';
+echo $toolbar = Display::toolbarAction('gradebook-student-actions', array(0 => $actionsLeft, 1 => ''));
 
 if (api_is_allowed_to_edit(null, true)) {
     // Tool introduction
diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php
index 371ffedbee..c347b56556 100644
--- a/main/gradebook/lib/GradebookUtils.php
+++ b/main/gradebook/lib/GradebookUtils.php
@@ -953,7 +953,7 @@ class GradebookUtils
         $counter = 1;
         $badges = array();
         foreach ($list_values as $value) {
-            $class = 'info';
+            $class = 'warning';
             if ($counter == 1) {
                 $class = 'success';
             }
diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php
index f9ddcd5eef..5664f6976b 100755
--- a/main/gradebook/lib/be/category.class.php
+++ b/main/gradebook/lib/be/category.class.php
@@ -1998,11 +1998,11 @@ class Category implements GradebookItem
                 $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $my_certificate['id'];
 
                 $certificates = Display::url(
-                    '&nbsp;'.get_lang('DownloadCertificate'),
+                    Display::returnFontAswesomeIcon('download').' '.get_lang('DownloadCertificate'),
                     $url,
                     array(
                         'target' => '_blank',
-                        'class' => 'btn btn-default'
+                        'class' => 'btn btn-sm btn-primary'
                     )
                 );
 
diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
index 29ec8d4d25..892deaeb70 100755
--- a/main/gradebook/lib/fe/displaygradebook.php
+++ b/main/gradebook/lib/fe/displaygradebook.php
@@ -474,12 +474,12 @@ class DisplayGradebook
             if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) {
                 $aditionalButtons = null;
                 if (!empty($certificateLinkInfo)) {
-                    $aditionalButtons = '<div class="btn-group pull-right">';
+                    $aditionalButtons .= '<div class="btn-group pull-right">';
                     $aditionalButtons .= isset($certificateLinkInfo['certificate_link']) ? $certificateLinkInfo['certificate_link'] : '';
                     $aditionalButtons .= isset($certificateLinkInfo['badge_link']) ? $certificateLinkInfo['badge_link'] : '';
                     $aditionalButtons .= '</div>';
                 }
-                $scoreinfo .= '<h4>' . sprintf(get_lang('TotalX'), $scorecourse_display . $aditionalButtons). '</h4>';
+                $scoreinfo .= '<strong>' . sprintf(get_lang('TotalX'), $scorecourse_display . $aditionalButtons). '</strong>';
 
             }
             Display :: display_normal_message($scoreinfo, false);
@@ -539,15 +539,15 @@ class DisplayGradebook
         }
 
         // for course admin & platform admin add item buttons are added to the header
-        $header .= '<div class="actions">';
-
+       
+        $actionsLeft = '';
         $my_category = $catobj->shows_all_information_an_category($catobj->get_id());
         $user_id = api_get_user_id();
         $my_api_cidreq = api_get_cidreq();
 
         if (api_is_allowed_to_edit(null, true)) {
             if (empty($grade_model_id) || $grade_model_id == -1) {
-                $header .= '<a href="gradebook_add_cat.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' .
+                $actionsLeft .= '<a href="gradebook_add_cat.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' .
                     Display::return_icon('new_folder.png', get_lang('AddGradebook'), array(), ICON_SIZE_MEDIUM) . '</a></td>';
             }
             if ($selectcat == '0') {
@@ -558,70 +558,66 @@ class DisplayGradebook
                     $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
                 }
                 if ($show_add_link && !$message_resource) {
-                    $header .= '<td><a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
+                   $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
                         Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
                     $cats = Category :: load($selectcat);
 
                     if ($cats[0]->get_course_code() != null && !$message_resource) {
-                        $header .= '<td><a href="gradebook_add_link.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
+                        $actionsLeft .= '<a href="gradebook_add_link.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
                             Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM) . '</a>';
                     } else {
-                        $header .= '<td><a href="gradebook_add_link_select_course.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
+                        $actionsLeft .= '<a href="gradebook_add_link_select_course.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
                             Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM) . '</a>';
                     }
                 }
 
                 if (!$message_resource) {
-                    $header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
+                    $actionsLeft .= '<a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
                         Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
 
                     if ($my_category['generate_certificates'] == 1) {
-                        $header .= "<td style=\"vertical-align: top;\">"
-                            . Display::url(
+                        $actionsLeft .= Display::url(
                                 Display::return_icon(
-                                    'certificate_list.png',
-                                    get_lang('GradebookSeeListOfStudentsCertificates'),
-                                    '',
-                                    ICON_SIZE_MEDIUM
-                                ),
+                                        'certificate_list.png',
+                                        get_lang('GradebookSeeListOfStudentsCertificates'),
+                                        '',
+                                        ICON_SIZE_MEDIUM
+                                        ),
                                 "gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . intval($_GET['selectcat'])
-                            )
-                            . "</td>";
+                            );
                     }
 
-                    $header .= "<td style=\"vertical-align: top;\">"
-                        . Display::url(
+                    $actionsLeft .= Display::url(
                             Display::return_icon(
-                                'user.png',
-                                get_lang('GradebookListOfStudentsReports'),
-                                '',
-                                ICON_SIZE_MEDIUM
-                            ),
+                                    'user.png',
+                                    get_lang('GradebookListOfStudentsReports'),
+                                    '',
+                                    ICON_SIZE_MEDIUM
+                                    ),
                             "gradebook_display_summary.php?$my_api_cidreq&selectcat=" . intval($_GET['selectcat'])
-                        )
-                        . "</td>";
+                        );
 
 
                     // Right icons
-                    $modify_icons = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
+                    $actionsRight = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
                         Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM) . '</a>';
-                    $modify_icons .= '<a href="../document/document.php?curdirpath=/certificates&' . $my_api_cidreq . '&origin=gradebook&selectcat=' . $catobj->get_id() . '">' .
+                    $actionsRight .= '<a href="../document/document.php?curdirpath=/certificates&' . $my_api_cidreq . '&origin=gradebook&selectcat=' . $catobj->get_id() . '">' .
                             Display::return_icon('certificate.png', get_lang('AttachCertificate'), '', ICON_SIZE_MEDIUM) . '</a>';
 
                     if (empty($categories)) {
-                        $modify_icons .= '<a href="gradebook_edit_all.php?id_session=' . api_get_session_id() . '&amp;' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
+                        $actionsRight .= '<a href="gradebook_edit_all.php?id_session=' . api_get_session_id() . '&amp;' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
                             Display::return_icon('percentage.png', get_lang('EditAllWeights'), '', ICON_SIZE_MEDIUM) . '</a>';
                     }
                     $score_display_custom = api_get_setting('gradebook_score_display_custom');
                     if (api_get_setting('teachers_can_change_score_settings') == 'true' && $score_display_custom['my_display_custom'] == 'true') {
-                        $modify_icons .= '<a href="gradebook_scoring_system.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
+                        $actionsRight .= '<a href="gradebook_scoring_system.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
                             Display::return_icon('ranking.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM) . '</a>';
                     }
-                    $header .= Display::div($modify_icons, array('class' => 'right'));
+                    
                 }
             }
         } elseif (isset($_GET['search'])) {
-            $header .= '<b>' . get_lang('SearchResults') . ' :</b>';
+            echo $header = '<b>' . get_lang('SearchResults') . ' :</b>';
         }
 
         $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
@@ -630,24 +626,24 @@ class DisplayGradebook
         );
 
         if ($isDrhOfCourse) {
-            $header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
+            $$actionsLeft .= '<a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
                 Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
         }
 
-        $header .= '</div>';
-
-        echo $header;
+        if (api_is_allowed_to_edit(null, true)){
+            echo $toolbar = Display::toolbarAction('gradebook-actions', array(0 => $actionsLeft, 1 => $actionsRight ));
+        }
 
         if (api_is_allowed_to_edit(null, true)) {
             $weight = intval($catobj->get_weight()) > 0 ? $catobj->get_weight() : 0;
-            $weight = get_lang('TotalWeight') . ' : ' . $weight;
+            $weight = '<strong>' . get_lang('TotalWeight') . ' : </strong>' . $weight;
 
             $min_certification = (intval($catobj->get_certificate_min_score() > 0) ? $catobj->get_certificate_min_score() : 0);
             $min_certification = get_lang('CertificateMinScore') . ' : ' . $min_certification;
-            $edit_icon = '<a class="right_link" href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
+            $edit_icon = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
                 Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
             //$msg = Display::tag('h3', $weight.' - '.$min_certification);
-            $msg = Display::tag('h4', $weight . ' - ' . $min_certification . $edit_icon);
+            $msg = $weight . ' - ' . $min_certification . $edit_icon;
             //@todo show description
             $description = (($catobj->get_description() == "" || is_null($catobj->get_description())) ? '' : '<strong>' . get_lang('GradebookDescriptionLog') . '</strong>' . ': ' . $catobj->get_description());
             Display::display_normal_message($msg, false);
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index b88bba37da..d18bb3bef7 100755
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -279,7 +279,7 @@ class GradebookTable extends SortableTable
 
             // Name.
             if (get_class($item) == 'Category') {
-                $row[] = $invisibility_span_open.'<h3>'.$item->get_name().'</h3>'.$invisibility_span_close;
+                $row[] = $invisibility_span_open.'<strong>'.$item->get_name().'</strong>'.$invisibility_span_close;
                 $main_categories[$item->get_id()]['name'] = $item->get_name();
             } else {
                 $name = $this->build_name_link($item, $type);
@@ -309,7 +309,7 @@ class GradebookTable extends SortableTable
             );
 
             if ($this->teacherView) {
-                $row[] = $invisibility_span_open .Display::tag('h4', $weight).$invisibility_span_close;
+                $row[] = $invisibility_span_open .Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
             } else {
                 $row[] = $invisibility_span_open .$weight.$invisibility_span_close;
             }
@@ -593,7 +593,7 @@ class GradebookTable extends SortableTable
                 $row = array(
                     null,
                     null,
-                    '<h3>' . get_lang('Total') . '</h3>',
+                    '<strong>' . get_lang('Total') . '</strong>',
                     null,
                     $total
                 );
@@ -708,7 +708,7 @@ class GradebookTable extends SortableTable
                     $weight_total_links > $weight_category
                 ) {
                     $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
-                    $modify_icons  = '<a class="right_link" href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
+                    $modify_icons  = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
                         Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
                     $warning_message .= $modify_icons;
                     Display::display_warning_message($warning_message, false);