diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
index 8ab559351d..90cb98ac73 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -15,22 +15,21 @@
     {% elseif 'dev' == collector.symfonyState %}
         {% set block_status = 'yellow' %}
         {% set symfony_version_status = 'This Symfony version is still in the development phase.' %}
-    <span class="sf-toolbar-status sf-toolbar-status-yellow" title="">
     {% else %}
         {% set block_status = '' %}
         {% set symfony_version_status = '' %}
     {% endif %}
 
     {% set icon %}
-        <a href="https://symfony.com/" title="{{ symfony_version_status }}">
             {% if collector.applicationname %}
                 <span class="sf-toolbar-label">{{ collector.applicationname }}</span>
                 <span class="sf-toolbar-value">{{ collector.applicationversion }}</span>
             {% elseif collector.symfonyState is defined %}
-                <span class="sf-toolbar-label">symfony</span>
-                <span class="sf-toolbar-value">{{ collector.symfonyversion }}</span>
+                <a href="https://symfony.com/" title="{{ symfony_version_status }}">
+                    <span class="sf-toolbar-label">symfony</span>
+                    <span class="sf-toolbar-value">{{ collector.symfonyversion }}</span>
+                </a>
             {% endif %}
-        </a>
     {% endset %}
     {% set text %}
         {% if collector.applicationname %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 7cfcface33..29b1d5b363 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -180,7 +180,7 @@
 
                 requestCounter[0].textContent = requestStack.length;
 
-                var className = 'sf-toolbar-ajax-requests sf-toolvar-value';
+                var className = 'sf-toolbar-ajax-requests sf-toolbar-value';
                 if (state == 'ok') {
                     className += ' sf-toolbar-status-green';
                 } else if (state == 'error') {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
index 8b732d24e3..ab4e07f93e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
@@ -1,12 +1,6 @@
-
-    <div class="sf-toolbar-block sf-toolbar-block-{{ block_name|default(name) }} sf-toolbar-status-{{ block_status|default('') }}">
-{% if link %}
-    <a href="{{ path('_profiler', { 'token': token, 'panel': name }) }}">
-{% endif %}
+<div class="sf-toolbar-block sf-toolbar-block-{{ block_name|default(name) }} sf-toolbar-status-{{ block_status|default('normal') }}">
+    {% if link %}<a href="{{ path('_profiler', { 'token': token, 'panel': name }) }}"{% endif %}
         <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
         <div class="sf-toolbar-info">{{ text|default('') }}</div>
-{% if link %}
-    </a>
-{% endif %}
-    </div>
-
+    {% if link %}</a>{% endif %}
+</div>