diff --git a/main/badge/criteria.php b/main/badge/criteria.php
index 93e55d5699..a43a8751e8 100644
--- a/main/badge/criteria.php
+++ b/main/badge/criteria.php
@@ -5,13 +5,25 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.badge
  */
-header('Content-Type: text/plain');
-
 require_once '../inc/global.inc.php';
 
-$skillId = isset($_GET['id']) ? intval($_GET['id']) : 0;
+$entityManager = Database::getManager();
+$skill = $entityManager->find('ChamiloCoreBundle:Skill', $_GET['id']);
+
+$skillInfo = [
+    'name' => $skill->getName(),
+    'short_code' => $skill->getShortCode(),
+    'description' => $skill->getDescription(),
+    'criteria' => $skill->getCriteria(),
+    'badge_image' => $skill->getWebIconPath()
+];
+
+$template = new Template();
+$template->assign('skill_info', $skillInfo);
 
-$objSkill = new Skill();
-$skill = $objSkill->get($skillId);
+$content = $template->fetch(
+    $template->get_template('skill/criteria.tpl')
+);
 
-echo $skill['criteria'];
+$template->assign('content', $content);
+$template->display_one_col_template();
diff --git a/main/template/default/skill/criteria.tpl b/main/template/default/skill/criteria.tpl
new file mode 100644
index 0000000000..3b35cd6a40
--- /dev/null
+++ b/main/template/default/skill/criteria.tpl
@@ -0,0 +1,24 @@
+<h1 class="page-header">{{ 'BadgeDetails'|get_lang }}</h1>
+<article>
+    <div class="row">
+        <div class="col-md-3">
+            <figure class="thumbnail">
+                <img class="img-responsive" src="{{ skill_info.badge_image }}" alt="{{ skill_info.name }}">
+                <figcaption class="caption">
+                    <h2 class="text-center">{{ skill_info.name }}</h2>
+                    {% if skill_info.short_code %}
+                        <p class="lead text-center">{{ skill_info.short_code }}</p>
+                    {% endif %}
+                </figcaption>
+            </figure>
+        </div>
+        <div class="col-md-9">
+            <h3>{{ 'Name'|get_lang }}</h3>
+            <p class="lead">{{ skill_info.name }}</p>
+            <h3>{{ 'Description'|get_lang }}</h3>
+            <p>{{ skill_info.description }}</p>
+            <h3>{{ 'CriteriaToEarnTheBadge'|get_lang }}</h3>
+            <p>{{ skill_info.criteria }}</p>
+        </div>
+    </div>
+</article>
diff --git a/main/template/default/social/skills_block.tpl b/main/template/default/social/skills_block.tpl
index 7c24c29459..8dabe94e6a 100644
--- a/main/template/default/social/skills_block.tpl
+++ b/main/template/default/social/skills_block.tpl
@@ -32,7 +32,7 @@
                     <ul class="list-unstyled list-badges">
                         {% for skill in skills %}
                             <li class="thumbnail">
-                                <a href="{{ _p.web_main ~ 'badge/criteria.php?' ~ {'id': skill.id}|url_encode() }}" data-title="{{ skill.name }}" class="ajax">
+                                <a href="{{ _p.web_main ~ 'badge/criteria.php?' ~ {'id': skill.id}|url_encode() }}" target="_blank">
                                     <img title="{{ skill.name }}" class="img-responsive" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
                                     <div class="caption">
                                         <p class="text-center">{{ skill.name }}</p>
diff --git a/src/Chamilo/CoreBundle/Entity/Skill.php b/src/Chamilo/CoreBundle/Entity/Skill.php
index 8712476d02..ddeb9704d9 100644
--- a/src/Chamilo/CoreBundle/Entity/Skill.php
+++ b/src/Chamilo/CoreBundle/Entity/Skill.php
@@ -194,6 +194,18 @@ class Skill
         return $this->icon;
     }
 
+    /**
+     * Get the icon URL
+     * @return string
+     */
+    public function getWebIconPath(){
+        if ($this->getIcon()) {
+            return api_get_path(WEB_UPLOAD_PATH) . "badges/{$this->getIcon()}";
+        }
+
+        return \Display::return_icon('badges-default.png', null, null, ICON_SIZE_HUGE, null, true);
+    }
+
     /**
      * Set criteria
      *