diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index 2ff96bca76..66d055781b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -79,11 +79,21 @@
 }
 
 .sf-toolbar-block .sf-toolbar-info-piece {
-    padding-bottom: 5px;
+    padding-left: 9px;
+    padding-right: 9px;
+    line-height: 19px;
+    margin-bottom: 5px;
+}
+
+.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
+    padding: 0px 5px;
+    border-radius: 5px;
+    margin-bottom: 0px;
+    vertical-align: top;
 }
 
 .sf-toolbar-block .sf-toolbar-info-piece:last-child {
-    padding-bottom: 0;
+    margin-bottom: 0;
 }
 
 .sf-toolbar-block .sf-toolbar-info-piece a,
@@ -94,6 +104,7 @@
 .sf-toolbar-block .sf-toolbar-info-piece b {
     display: inline-block;
     width: 110px;
+    vertical-align: top;
 }
 
 .sf-toolbar-block .sf-toolbar-info-with-next-pointer:after {
@@ -112,11 +123,13 @@
     position: absolute;
     background-color: #fff;
     border: 1px solid #bbb;
-    padding: 10px 8px;
+    padding: 9px 0;
     margin-left: -1px;
 
     bottom: 38px;
     border-bottom-width: 0;
+    border-bottom: 1px solid #bbb;
+    border-radius: 4px 4px 0 0;
 }
 
 .sf-toolbar-block .sf-toolbar-info:empty {
@@ -230,14 +243,24 @@
 }
 
 .sf-toolbar-block:hover {
-    box-shadow: rgba(0, 0, 0, 0.3) 0 0 5px;
+    box-shadow: rgba(0, 0, 0, 0.35) 0 0 5px;
+    border-right: none;
+    margin-right: 1px;
+    position: relative;
 }
 
 .sf-toolbar-block:hover .sf-toolbar-icon {
     background-color: #fff;
+    border-top: 1px dotted #DDD;
+    position: relative;
+    margin-top: -1px;
+    z-index: 10002;
 }
+
 .sf-toolbar-block:hover .sf-toolbar-info {
     display: block;
+    min-width: 100%;
+    z-index: 10001;
 }
 
 /***** Override the setting when the toolbar is on the top *****/
@@ -274,7 +297,14 @@
         top: 39px;
         bottom: auto;
         border-top-width: 0;
-        border-bottom: 1px solid #bbb;
+        border-radius: 0 0 4px 4px;
+    }
+
+    .sf-toolbar-block:hover .sf-toolbar-icon {
+        border-top: none;
+        border-bottom: 1px dotted #DDD;
+        margin-top: 0;
+        margin-bottom: -1px;
     }
 {% endif %}