diff --git a/index.php b/index.php
index 72b5876d6a..f7bca34ea7 100755
--- a/index.php
+++ b/index.php
@@ -165,7 +165,6 @@ $controller->tpl->assign('navigation_course_links', $controller->return_navigati
 $controller->tpl->assign('notice_block', $controller->return_notice());
 $controller->tpl->assign('main_navigation_block', $controller->return_navigation_links());
 $controller->tpl->assign('help_block', $controller->return_help());
-$controller->tpl->assign('certificates_search_block', $controller->returnCertificatesSearchBlock());
 
 if (api_is_platform_admin() || api_is_drh()) {
     $controller->tpl->assign('skills_block', $controller->return_skills_links());
diff --git a/main/img/icons/22/graduation.png b/main/img/icons/22/graduation.png
new file mode 100644
index 0000000000..22e732e753
Binary files /dev/null and b/main/img/icons/22/graduation.png differ
diff --git a/main/img/icons/22/search_graduation.png b/main/img/icons/22/search_graduation.png
new file mode 100644
index 0000000000..96ad2a36ad
Binary files /dev/null and b/main/img/icons/22/search_graduation.png differ
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 19176a1f5a..66c5f78a7d 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -323,19 +323,56 @@ class IndexManager
 
     function return_skills_links() {
         $html = '';
+        $content = '';
+        $content .= '<ul class="nav nav-pills nav-stacked">';
+        /**
+         * Generate the block for show a panel with links to My Certificates and Certificates Search pages
+         * @return string The HTML code for the panel
+         */
+        $certificatesItem = null;
+
+        if (!api_is_anonymous()) {
+            $certificatesItem = Display::tag(
+                'li',
+                Display::url(Display::return_icon('graduation.png',get_lang('MyCertificates'),null,ICON_SIZE_SMALL).
+                    get_lang('MyCertificates'),
+                    api_get_path(WEB_CODE_PATH) . "gradebook/my_certificates.php"
+                )
+            );
+        }
+
+        $searchItem = null;
+
+        if (api_get_setting('allow_public_certificates') == 'true') {
+            $searchItem = Display::tag(
+                'li',
+                Display::url(Display::return_icon('search_graduation.png',get_lang('Search'),null,ICON_SIZE_SMALL).
+                    get_lang('Search'),
+                    api_get_path(WEB_CODE_PATH) . "gradebook/search.php"
+                )
+            );
+        }
+
+        if (empty($certificatesItem) && empty($searchItem)) {
+            return null;
+        }else{
+            $content.= $certificatesItem;
+            $content.= $searchItem;
+        }
+
         if (api_get_setting('allow_skills_tool') == 'true') {
-            $content = '<ul class="nav nav-pills nav-stacked">';
 
             $content .= Display::tag('li', Display::url(Display::return_icon('skill-badges.png',get_lang('MySkills'),null,ICON_SIZE_SMALL).get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/my_skills_report.php'));
-
             $allowSkillsManagement = api_get_setting('allow_hr_skills_management') == 'true';
-
             if (($allowSkillsManagement && api_is_drh()) || api_is_platform_admin()) {
-                $content .= Display::tag('li', Display::url(Display::return_icon('edit-skill.png',get_lang('MySkills'),null,ICON_SIZE_SMALL).get_lang('ManageSkills'), api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php'));
+                $content .= Display::tag('li',
+                    Display::url(Display::return_icon('edit-skill.png', get_lang('MySkills'), null,
+                            ICON_SIZE_SMALL) . get_lang('ManageSkills'),
+                        api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php'));
             }
-            $content .= '</ul>';
-            $html = self::show_right_block(get_lang("Skills"), $content, 'skill_block');
         }
+        $content .= '</ul>';
+        $html = self::show_right_block(get_lang("Skills"), $content, 'skill_block');
         return $html;
     }
 
@@ -1423,49 +1460,4 @@ class IndexManager
         return CourseManager::return_hot_courses();
     }
 
-    /**
-     * Generate the block for show a panel with links to My Certificates and Certificates Search pages
-     * @return string The HTML code for the panel
-     */
-    public function returnCertificatesSearchBlock()
-    {
-
-        $certificatesItem = null;
-
-        if (!api_is_anonymous()) {
-            $certificatesItem = Display::tag(
-                'li',
-                Display::url(
-                    get_lang('MyCertificates'),
-                    api_get_path(WEB_CODE_PATH) . "gradebook/my_certificates.php"
-                )
-            );
-        }
-
-        $searchItem = null;
-
-        if (api_get_setting('allow_public_certificates') == 'true') {
-            $searchItem = Display::tag(
-                'li',
-                Display::url(
-                    get_lang('Search'),
-                    api_get_path(WEB_CODE_PATH) . "gradebook/search.php"
-                )
-            );
-        }
-
-        if (empty($certificatesItem) && empty($searchItem)) {
-            return null;
-        }
-
-        return Display::panel(
-            Display::tag(
-                'ul',
-                implode(' ', [$certificatesItem, $searchItem]),
-                ['class' => 'nav nav-pills nav-stacked']
-            ),
-            get_lang('Certificates')
-        );
-    }
-
 }
diff --git a/user_portal.php b/user_portal.php
index d016f996da..3ec45f4f82 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -183,8 +183,6 @@ $controller->tpl->assign('course_block', $controller->return_course_block());
 $controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
 $controller->tpl->assign('search_block', $controller->return_search_block());
 $controller->tpl->assign('classes_block', $controller->return_classes_block());
-$controller->tpl->assign('certificates_search_block', $controller->returnCertificatesSearchBlock());
-
 //if (api_is_platform_admin() || api_is_drh()) {
 $controller->tpl->assign('skills_block', $controller->return_skills_links());
 //}