diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css
index e420c9b685..c37fdce5fa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css
@@ -122,29 +122,29 @@ build: 56
     height: 28px;
     float: left;
     padding: 0 0 0 7px;
-    background: transparent url(../images/border_l.png) no-repeat top left;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQtJREFUeNpiPHnyJAMakARiByDWYEGT8ADiYGVlZStubm5xlv///4MEQYoKZGRkQkRERLRYWVl5wYJQyXBZWdkwCQkJUxAHKgaWlAHSLqKiosb//v1DsYMFKGCvoqJiDmQzwXTAJYECulxcXNLoumCSoszMzDzoumDGghQwYZUECWIzkrAkSIIGOmlkLI10AiX//P379x8jIyMTNmPf/v79+ysLCwsvuiQoNi5//fr1Kch4dAyS3P/gwYMTQBP+wxwHw0xA4gkQ73v9+vUZdJ2w1Lf82bNn4iCHCQoKasHsZw4ODgbRIL8c+/Lly5M3b978Y2dn5wC6npkFLXnsAOKLjx49AmUHLYAAAwBoQubG016R5wAAAABJRU5ErkJggg==) no-repeat top left;
 }
 .sf-button .border-r {
     padding: 0 7px 0 0;
-    background: transparent url(../images/border_r.png) right top no-repeat;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
 }
 .sf-button .btn-bg {
     padding: 0px 14px;
     color: #636363;
     line-height: 28px;
-    background: transparent url(../images/btn_bg.png) repeat-x top left;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;
 }
 .sf-button:hover .border-l,
 .sf-button-selected .border-l {
-    background: transparent url(../images/border_l_hover.png) no-repeat top left;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR9JREFUeNpi/P//PwMyOHfunDqQSgNiexZkibNnzxYBqZa3HOs5v7PcYQBLnjlzhg1IbfzIdsTjA/t+ht9Mr8GKwZL//v3r+sB+0OMN+zqIEf8gFMvJkyd1gXTOa9YNDP//otrPAtSV/Jp9HfPff78Z0AEL0LUeXxivMfxD0wXTqfjj/2ugkf+wSrL9/YtpJEyS4S8WI5Ek/+GR/POPFjr//cenE6/kP9q4Fo/kr39/mdj+M/zFkGQCSj5i+ccPjLJ/GBgkuYOHQR1sNDpmAkb2LBmWwL///zKCIxwZM0VHR18G6p4uxeLLAA4tJMwEshiou1iMxXaHLGswA+t/YbhORuQUv2DBAnCifvxzI+enP3dQJUFg/vz5sOzgBBBgAPxX9j0YnH4JAAAAAElFTkSuQmCC) no-repeat top left;
 }
 .sf-button:hover .border-r,
 .sf-button-selected .border-r {
-    background: transparent url(../images/border_r_hover.png) right top no-repeat;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAT5JREFUeNpiPHv27BkGBoaDQDzLyMjoJgMSYHrM3WX8hn1d0f///88DFRYhSzIuv2X5H8Rg/SfKIPDTkYH/l80OINffxMTkF9O/f/8ZQPgnwyuGl+wrGd6x7vf49+9fO9jYf3+Bkkj4NesmBqAV+SdPntQC6vzHgIz//gOawbqOGchOxtAJwp8Zr4F0e7D8/fuPAR38/P8eZIo0yz8skv8YvoIk+YE6/zNgAyD7sRqLkPzzjxY6/+HS+R+fTkZ8djLh08lCUCcuSWawJGbwMTGwg7zyBatX2Bj5QZKPsBrLzaICktzN8g/NWEYGZgYZjoC/wMiei5FMpFh8QPSU6Ojoy3Cd7EwiDBJsDgxiLNY7gLrKQGIsHAxSDHxAO2TZ/b8D+TVxcXF9MCtYtLiKLgDpfUDVsxITE1GyA0CAAQA2E/N8VuHyAAAAAABJRU5ErkJggg==) right top no-repeat;
 }
 .sf-button:hover .btn-bg,
 .sf-button-selected .btn-bg {
     color: #FFFFFF;
     text-shadow:0 1px 1px #6b9311;
-    background: transparent url(../images/btn_bg_hover.png) repeat-x top left;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAIAAAAvP0KbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEFJREFUeNpiPnv2LNMdvlymf///M/37B8R/QfQ/MP33L4j+B6Qh7L9//sHpf2h8MA1V+w/KRjYLaDaLCU8vQIABAFO3TxZriO4yAAAAAElFTkSuQmCC) repeat-x top left;
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css
index ef7d67ace7..b780082518 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css
@@ -51,7 +51,7 @@ img {
     width: 195px;
     font-size: 12px;
     border: 1px solid #dadada;
-    background: #fff url(../images/input_bg.gif) repeat-x left top;
+    background: #fff url(data:image/gif;base64,R0lGODlhAQAFAKIAAPX19e/v7/39/fr6+urq6gAAAAAAAAAAACH5BAAAAAAALAAAAAABAAUAAAMESAEjCQA7) repeat-x left top;
     padding: 5px 6px;
     color: #565656;
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png
deleted file mode 100644
index af273fbac1..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png
deleted file mode 100644
index 1d59ac5e27..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png
deleted file mode 100644
index cb14c6d355..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png
deleted file mode 100644
index ecc24edfd8..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png
deleted file mode 100644
index afb9368ec1..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png
deleted file mode 100644
index 0b04deb7fb..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/close_quote.gif b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/close_quote.gif
deleted file mode 100644
index b97296a569..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/close_quote.gif and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.png
deleted file mode 100644
index c56c3d2ae3..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/icon_log.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/icon_log.png
deleted file mode 100644
index d5b5c7609c..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/icon_log.png and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/input_bg.gif b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/input_bg.gif
deleted file mode 100644
index 7c0efc1087..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/input_bg.gif and /dev/null differ
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/open_quote.gif b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/open_quote.gif
deleted file mode 100644
index 0e116ceadd..0000000000
Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/open_quote.gif and /dev/null differ
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
index e506ad92ce..5b44b81215 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
@@ -1,11 +1,11 @@
 <div class="block-exception">
     <div class="block-exception-detected clear-fix">
         <div class="illustration-exception">
-            <img alt="Exception detected!" src="{{ asset('bundles/framework/images/exception_detected.png') }}"/>
+            <img alt="Exception detected!" src="data:image/png;base64,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" />
         </div>
         <div class="text-exception">
             <div class="open-quote">
-                <img alt="" src="{{ asset('bundles/framework/images/open_quote.gif') }}"/>
+                <img alt="" src="data:image/gif;base64,R0lGODlhHAAWAMQQANra2+bl5s3Mzevr6/Pz8+jo6O3t7fHx8c/Oz+Pj49PS093d3djX2NXV1eDf4MrJyvb29gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAcABYAQAWWICSOEDE4AamqRuAsT5yu6hA/wNrcfNysjl5PBOAJAAUDDRLoNRKDndAHnN6k058qaH2QuNelqCAYIm45MfGmIJCkAvUIPNB1td/uAyvEz/UqB0VUagQOZTEjgzx+Kk1CEAU8DAdqB4gPCHVjNwhucphKbzefamAFdlaNEGBZd1V3r1t6fE6wqrJ5XS4Ovb69MyQnv8QhADs=" />
             </div>
 
             <h1>
@@ -30,7 +30,7 @@
             {% endif %}
 
             <div class="close-quote">
-                <img alt="" src="{{ asset('bundles/framework/images/close_quote.gif') }}"/>
+                <img alt="" src="data:image/gif;base64,R0lGODlhHAAWAMQQANra2+bl5s3Mzevr6/Pz8+jo6O3t7fHx8c/Oz+Pj49PS093d3djX2NXV1eDf4MrJyvb29gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAcABYAQAWZoCOO5ACdaECuweO+sIOiDWw36IC8wjH/kAMDVoDYbLJf7ejC/QqvJHBGeC0fAgdhOrsCfDNmFHg9lo9SmvhxRpLXTpSBx6XuXNBjoN4GoNYPaSdtVoCCEIRNhm9iiS6Hjo6BjExxOWN1KAJNQAAvJpkQLS4LVAovfqGeLggQAwlne1MGBQCbqCc2AkV8bigOAQahKQ4DW0AhADs=" />
             </div>
         </div>
     </div>
@@ -47,8 +47,8 @@
             <h2>
                 Logs&nbsp;
                 <a href="#" onclick="toggle('logs'); switchIcons('icon-logs-open', 'icon-logs-close'); return false;">
-                    <img class="toggle" id="icon-logs-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: hidden" />
-                    <img class="toggle" id="icon-logs-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: visible; margin-left: -18px" />
+                    <img class="toggle" id="icon-logs-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: hidden" />
+                    <img class="toggle" id="icon-logs-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: visible; margin-left: -18px" />
                 </a>
             </h2>
             {% endspaceless %}
@@ -60,7 +60,6 @@
                     </span>
                 </div>
             {% endif %}
-
         </div>
 
         <div id="logs">
@@ -75,8 +74,8 @@
         <h2>
             Content of the Output&nbsp;
             <a href="#" onclick="toggle('output-content'); switchIcons('icon-content-open', 'icon-content-close'); return false;">
-                <img class="toggle" id="icon-content-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: hidden" />
-                <img class="toggle" id="icon-content-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: visible; margin-left: -18px" />
+                <img class="toggle" id="icon-content-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: hidden" />
+                <img class="toggle" id="icon-content-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: visible; margin-left: -18px" />
             </a>
         </h2>
         {% endspaceless %}
@@ -89,7 +88,6 @@
     </div>
 {% endif %}
 
-
 <script type="text/javascript">//<![CDATA[
     function toggle(id, clazz) {
         var el = document.getElementById(id),
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
index 8f9d79a654..37b2ecc2b4 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
@@ -12,8 +12,8 @@
     in {{ trace.file|format_file(trace.line) }}&nbsp;
     {% spaceless %}
     <a href="#" onclick="toggle('trace-{{ prefix ~ '-' ~ i }}'); switchIcons('icon-{{ prefix ~ '-' ~ i }}-open', 'icon-{{ prefix ~ '-' ~ i }}-close'); return false;">
-        <img class="toggle" id="icon-{{ prefix ~ '-' ~ i }}-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == i ? 'display' : 'hidden' }}" />
-        <img class="toggle" id="icon-{{ prefix ~ '-' ~ i }}-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == i ? 'hidden' : 'display' }}; margin-left: -18px" />
+        <img class="toggle" id="icon-{{ prefix ~ '-' ~ i }}-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: {{ 0 == i ? 'display' : 'hidden' }}" />
+        <img class="toggle" id="icon-{{ prefix ~ '-' ~ i }}-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: {{ 0 == i ? 'hidden' : 'display' }}; margin-left: -18px" />
     </a>
     {% endspaceless %}
     <div id="trace-{{ prefix ~ '-' ~ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
index 0e971dbe72..e9359959d2 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
@@ -5,8 +5,8 @@
             {{ exception.class|abbr_class }}: {{ exception.message|nl2br|format_file_from_text }}&nbsp;
             {% spaceless %}
             <a href="#" onclick="toggle('traces-{{ position }}', 'traces'); switchIcons('icon-traces-{{ position }}-open', 'icon-traces-{{ position }}-close'); return false;">
-                <img class="toggle" id="icon-traces-{{ position }}-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == count ? 'display' : 'hidden' }}" />
-                <img class="toggle" id="icon-traces-{{ position }}-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == count ? 'hidden' : 'display' }}; margin-left: -18px" />
+                <img class="toggle" id="icon-traces-{{ position }}-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: {{ 0 == count ? 'display' : 'hidden' }}" />
+                <img class="toggle" id="icon-traces-{{ position }}-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: {{ 0 == count ? 'hidden' : 'display' }}; margin-left: -18px" />
             </a>
             {% endspaceless %}
         </h2>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
index 384fba6691..49f997b504 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
@@ -12,14 +12,14 @@
         <div id="content">
             <div class="header clear-fix">
                 <div class="header-logo">
-                    <img src="{{ asset('bundles/framework/images/logo_symfony.png') }}" alt="Symfony" />
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALYAAAA+CAMAAACxzRGDAAAAUVBMVEX////Ly8yko6WLioxkYmVXVVkwLjLl5eWxsLJKSEzy8vJxcHLY2Ni+vb89Oz9XVVh+fH+Yl5n///+xsbLY2Nlxb3KkpKWXlph+fX+LiYy+vr/IZP61AAAAAXRSTlMAQObYZgAABRBJREFUeNrVmtuWoyAQRS1FEEQSzQU7//+hYxUiXsKQZLJWM+chsUloN+WhCuguYoKyYqzmvGasKqH4HyRKxndipcgcumH8qViTM7TkUclcwaHmf5XM0eWq4km1KjdqXfMXJHVe1J3hL8lk5fCGv6wmT+o0d87U+XNrk0Y9nfv+7LM6ZJH5ZBL6LAbSxQ3Q5FDr22Skr8PQSy4n7isnsQxSX4r6pobhjCHHeDNOKrO3yGmCvZOjV9jmt8ulTdXFKdbKLNh+kOMvBzuVRa4Y7MUsdEUSWQe7xxCfZmcwjHU83LqzFvSbJQOXQvptbPnEFoyZtUUGwTeKuLuTHyT1kaP0P6cR01OKvv448gtl61dqZfmJezQmU/t+1R2fJLtBwXV6uWGwB9SZPrn0fKO2WAvQN1PUhHjTom3xgXYTkvlSKHs19OhslETq6X3HrXbjt8XbGj9b4Gi+lUAnL6XxQj8Pyk9N4Bt1xUrsLVN/3isYMug8rODMdbgOvoHs8uAb2fcANIAzkKCLYy+AXRpSU8sr1r4P67xhLgPp7vM32zlqt7Bhq2fI1Hwp+VgANxok59SsGV3oqdUL0YVDMRY7Yg8QLbVUU4NZNoOq5hJHuxEM28Sh/IyUZ8D3reR+yc58EGvOy2U0HQL6G9V+kWyEWHmzaMx6t4o9RhOm/riUiYrzqij4Ptqkn7AaCXqc+F47m04ahfde7YIz8RHEBN6BdVwdIGRVdNbKqYu1Hc0x0wBY4wqC8+XUgBGnj81SZsQB+0yAS1x/BlI/6ebHHk0lauQLuPDpu6EwAVJ7T0rl2uXa23jcqNyOZekhqYHRz3JOANrF4wCCmEs1f9D1lUe0n4NAATed80Y5e0Q7CO2TezM/BR6wKdgQzKbCF4uOQC3Bk0fKAzbFlyRWg3gksA/gmm7eOjrpaKX7fHlEW2xLbE6GZsPiCiShVzN7RG2xTz2G+OJtEqzdJ7APxy3MrSsV0VukXbKMp9lhs5BN6dr3CN+sySUaoxGwfRUM3I/gdPYONgVU+PLX4vUWm32AvUySarbONvcpV2RQEPKKjEBHFk01kQDGRblnn8ZuE9g+JUl8OWAPbkFK2K6JxhJVvF47FzYYnAN22ttwxKYCoH36rheEB7KG/HF/YUaa2G5JF+55tpyrl7B1WHM39HuP2N2EXPl1UBu8vbj4OjvD+NoTE4ssF+ScARgaJY1N7+u8bY/Y9BSM5PKwJbvMVab32YP5FB5TtcYVrGoASolVLTzI7kVsYVxRtAb5n2JXq1vCdtd47XtYItynrN0835PasLg0y13aOPbmPI+on2Lr9e5tjSHvgkAvclUjL3Fsdaw03IzgTR62yYClk7QMah4IQ0qSsoYYbOix6zJR1ZGDNMOY3Bb6W5S6jiyovep3t7bUPyoq7OkjYumrfESp8zSBc/OLosVf+nTnnKjsqR16++WDwpI8FxJWRFTlI6NKnqYJaL96TqjAbo9Toi5QiWBDcmfdFV+T8dkvFe5bItgstbM2X6QG2mVun+cazfRwOS0eiaeRRJKgLfc3BQAqfnhJyz8lfR6580SF/FXVu83Nz1xrrnFqqXL6Qxl47DNSm4RFflvN5sABDD8peouqLLKQXVdGbnqf+qIpOxON4ZyYdJEJ6sy4zS2c5eRPTT4Jyp46qDE5/ptAWqJOQ9e6yE82FXBbZCk1/tXVoshVoopE3CB0zmraI3nbqCJ/gW3ZMgtbC5nh/QHlOoOZBxQCRgAAAABJRU5ErkJggg==" alt="Symfony" />
                 </div>
 
                 <div class="search">
                     <form method="get" action="http://symfony.com/search" target="_blank">
                         <div class="form-row">
                             <label for="search-id">
-                                <img src="{{ asset('bundles/framework/images/grey_magnifier.png') }}" alt="Search on Symfony website" />
+                                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAABUElEQVQoz2NgAIJ29iBdD0d7X2cPb+tY2f9MDMjgP2O2hKu7vS8CBlisZUNSMJ3fxRMkXO61wm2ue6I3iB1q8Z8ZriDZFCS03fm/wX+1/xp/TBo8QPxeqf+MUAW+QIFKj/+q/wX/c/3n/i/6Qd/bx943z/Q/K1SBI1D9fKv/AhCn/Wf5L5EHdFGKw39OqAIXoPpOMziX4T9/DFBBnuN/HqhAEtCKCNf/XDA/rZRyAmrpsvrPDVUw3wrkqCiLaewg6TohX1d7X0ffs5r/OaAKfinmgt3t4ulr4+Xg4ANip3j+l/zPArNT4LNOD0pAgWCSOUIBy3+h/+pXbBa5tni0eMx23+/mB1YSYnENroT5Pw/QSOX/mkCo+l/jgo0v2KJA643s8PgAmsMBDCbu/5xALHPB2husxN9uCzsDOgAq5kAoaZVnYMCh5Ky1r88Eh/+iABM8jUk7ClYIAAAAAElFTkSuQmCC" alt="Search on Symfony website" />
                             </label>
 
                             <input name="q" id="search-id" type="search" placeholder="Search on Symfony website" />
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/bin/sync_assets.sh b/src/Symfony/Bundle/WebProfilerBundle/Resources/bin/sync_assets.sh
new file mode 100755
index 0000000000..6cff8d8276
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/bin/sync_assets.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR=`php -r "echo realpath(dirname('$0'));"`
+
+cp $DIR/../../../FrameworkBundle/Resources/public/css/body.css $DIR/../views/Profiler/body.css.twig
+cp $DIR/../../../FrameworkBundle/Resources/public/css/exception.css $DIR/../views/Collector/exception.css.twig
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
new file mode 100644
index 0000000000..2b2094e903
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
@@ -0,0 +1,106 @@
+.sf-reset .traces {
+    padding-bottom: 14px;
+}
+.sf-reset .traces li {
+    font-size: 12px;
+    color: #868686;
+    padding: 5px 4px;
+    list-style-type: decimal;
+    margin-left: 20px;
+    white-space: break-word;
+}
+.sf-reset #logs .traces li.error {
+    font-style: normal;
+    color: #AA3333;
+    background: #f9ecec;
+}
+.sf-reset #logs .traces li.warning {
+    font-style: normal;
+    background: #ffcc00;
+}
+/* fix for Opera not liking empty <li> */
+.sf-reset .traces li:after {
+    content: "\00A0";
+}
+.sf-reset .trace {
+    border: 1px solid #D3D3D3;
+    padding: 10px;
+    overflow: auto;
+    margin: 10px 0 20px;
+}
+.sf-reset .block-exception {
+    -moz-border-radius: 16px;
+    -webkit-border-radius: 16px;
+    border-radius: 16px;
+    margin-bottom: 20px;
+    background-color: #f6f6f6;
+    border: 1px solid #dfdfdf;
+    padding: 30px 28px;
+}
+.sf-reset .block-exception div {
+    color: #313131;
+    font-size: 10px;
+}
+.sf-reset .block-exception-detected .illustration-exception,
+.sf-reset .block-exception-detected .text-exception {
+    float: left;
+}
+.sf-reset .block-exception-detected .illustration-exception {
+    width: 152px;
+}
+.sf-reset .block-exception-detected .text-exception {
+    width: 670px;
+    padding: 30px 44px 24px 46px;
+    position: relative;
+}
+.sf-reset .text-exception .open-quote,
+.sf-reset .text-exception .close-quote {
+    position: absolute;
+}
+.sf-reset .open-quote {
+    top: 0;
+    left: 0;
+}
+.sf-reset .close-quote {
+    bottom: 0;
+    right: 50px;
+}
+.sf-reset .block-exception p {
+    font-family: Arial, Helvetica, sans-serif;
+}
+.sf-reset .block-exception p a,
+.sf-reset .block-exception p a:hover {
+    color: #565656;
+}
+.sf-reset .logs h2 {
+    float: left;
+    width: 654px;
+}
+.sf-reset .error-count {
+    float: right;
+    width: 170px;
+    text-align: right;
+}
+.sf-reset .error-count span {
+    display: inline-block;
+    background-color: #aacd4e;
+    -moz-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    padding: 4px;
+    color: white;
+    margin-right: 2px;
+    font-size: 11px;
+    font-weight: bold;
+}
+.sf-reset .toggle {
+    vertical-align: middle;
+}
+.sf-reset .linked ul,
+.sf-reset .linked li {
+    display: inline;
+}
+.sf-reset #output-content {
+    color: #000;
+    font-size: 12px;
+}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
index 519dfb364b..6dbfef293c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
@@ -1,7 +1,9 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block head %}
-    <link rel="stylesheet" href="{{ asset('bundles/framework/css/exception.css') }}" />
+    <style type="text/css">
+        {% include '@WebProfiler/Collector/exception.css.twig' %}
+    </style>
     {{ parent() }}
 {% endblock %}
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
index af152dbe6e..053eee837b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
@@ -5,11 +5,17 @@
         <meta name="robots" content="noindex,nofollow" />
         <title>{% block title 'Profiler' %}</title>
         <link rel="icon" type="image/x-icon" sizes="16x16" href="data:image/ico;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAADIvMQAyLzEIMi8xSzEuMKoyLzHkMi8x/TIvMf0yLzHlMi8xrDIvMU4yLzEJMi8xAAAAAAAAAAAAAAAAADIvMQAyLzEYMS4wkTMwMu45Njj/MS4w/zEuMP8yLzH/Mi8x/zIvMf8yLzHvMi8xlDIvMRkyLzEAAAAAADIvMQAyLzEXMS4wrTk2OPyVk5T7kI6P/nl3ef8+Oz3/MS4w/zIvMf8yLzH/Mi8x/zIvMf4yLzGxMi8xGjIvMQAyLzEGMi8xkDEuMP4/PD79wcDA+oB+gP6Ni4z/paOk/zk2OP8xLjD/Mi8x/zIvMf8yLzH/Mi8x/zIvMZQyLzEIMi8xSTIvMewyLzH/MS4w/z06PP81MjT+TktN/93c3f97eXv/MC0v/zIvMf8yLzH/Mi8x/zIvMf8yLzHuMi8xTzIvMaUyLzH/Mi8x/0lHSf9kYmP/XFpb/zs4Ov/DwsL+ycjI/zs4Ov8xLjD/Mi8x/zIvMf8yLzH/Mi8x/zIvMawyLzHfMC0v/1tYWv+opqf/YV5g/8bFxf96eHn+m5qb/u7u7v9WVFX/MC0v/zIvMf8yLzH/Mi8x/zIvMf8yLzHkMi8x+jAtL/9iYGH/mZiZ/2dlZv/p6On/oJ+g/np4ev/6+vr/dXN1/y0qLP8xLjD/Mi8x/zIvMf8yLzH/Mi8x/DIvMfoyLzH/MzAy/0A+QP7JyMj85eXl/1tYWv9XVVf/8fDx/6qpqv9ZV1j/Q0BC/zIvMf8yLzH/Mi8x/zIvMfwyLzHeMi8x/zEuMP8/PD762dnZ9JWTlP81MjT/ZmRm/+Dg4P/DwsP/YV5g/6Wkpf9BPkD/MS4w/zIvMf8yLzHjMi8xozIvMf8yLzH/Mi8x/nZ0dv2amJn4dXN0+V5bXf+Pjo//0tLS/0hFR/9vbG7/Ozg6/zEuMP8yLzH/Mi8xqTIvMUcyLzHrMi8x/zIvMf8xLjD/Ozg6/Do3OfwwLS//REFD/728vP9nZWb/TktN/4mIif05Nzn/Mi8x7jMwMkwyLzEGMi8xjDIvMf4yLzH/Mi8x/zIvMf8yLzH/Mi8x/zAtL/9XVFb/goGC+Hx6e+6qqanwOzg6/DMwMpJDQEIIMi8xADIvMRUyLzGrMi8x/jIvMf8yLzH/Mi8x/zIvMf8yLzH/MS4w/zg2N/xBPkD3OTY4/DIvMa8yLzEYMi8xAAAAAAAyLzEAMi8xGDIvMY0yLzHqMi8x/zIvMf8yLzH/Mi8x/zIvMf8yLzH/MS4w7DEuMJEyLzEaMi8xAAAAAAAAAAAAAAAAADIvMQAyLzEGMi8xQzIvMZ4yLzHdMi8x+jIvMfoyLzHeMi8xoDIvMUUyLzEGMi8xAAAAAAAAAAAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==" />
-        <link rel="stylesheet" href="{{ asset('bundles/framework/css/body.css') }}" />
+        <style type="text/css">
+            {% include '@WebProfiler/Profiler/body.css.twig' %}
+        </style>
         {% block head %}
-            {% include '@WebProfiler/Profiler/profiler_style.html.twig' %}
+            <style type="text/css">
+                {% include '@WebProfiler/Profiler/profiler.css.twig' %}
+            </style>
         {% endblock %}
-        {% include '@WebProfiler/Profiler/toolbar_style.html.twig' with { 'position': 'top', 'floatable': false } %}
+        <style type="text/css">
+            {% include '@WebProfiler/Profiler/toolbar.css.twig' with { 'position': 'top', 'floatable': false } %}
+        </style>
     </head>
     <body>
         {% block body '' %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/body.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/body.css.twig
new file mode 100644
index 0000000000..c37fdce5fa
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/body.css.twig
@@ -0,0 +1,150 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.1.2
+build: 56
+*/
+.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;}
+.sf-reset html,
+.sf-reset body {
+    width: 100%;
+    min-height: 100%;
+    _height: 100%;
+    margin: 0;
+    padding: 0;
+}
+.sf-reset body {
+    font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+    text-align: left;
+    background-color: #efefef;
+}
+.sf-reset abbr {
+    border-bottom: 1px dotted #000;
+    cursor: help;
+}
+.sf-reset p {
+    font-size: 14px;
+    line-height: 20px;
+    padding-bottom: 20px;
+}
+.sf-reset strong {
+    color: #313131;
+    font-weight: bold;
+}
+.sf-reset a {
+    color: #6c6159;
+}
+.sf-reset a img {
+    border: none;
+}
+.sf-reset a:hover {
+    text-decoration: underline;
+}
+.sf-reset em {
+    font-style: italic;
+}
+.sf-reset h2,
+.sf-reset h3 {
+    font-weight: bold;
+}
+.sf-reset h1 {
+    font-family: Georgia, "Times New Roman", Times, serif;
+    font-size: 20px;
+    color: #313131;
+    word-break: break-all;
+}
+.sf-reset li {
+    padding-bottom: 10px;
+}
+.sf-reset .block {
+    -moz-border-radius: 16px;
+    -webkit-border-radius: 16px;
+    border-radius: 16px;
+    margin-bottom: 20px;
+    background-color: #FFFFFF;
+    border: 1px solid #dfdfdf;
+    padding: 40px 50px;
+}
+.sf-reset h2 {
+    font-size: 16px;
+    font-family: Arial, Helvetica, sans-serif;
+}
+.sf-reset li a {
+    background: none;
+    color: #868686;
+    text-decoration: none;
+}
+.sf-reset li a:hover {
+    background: none;
+    color: #313131;
+    text-decoration: underline;
+}
+.sf-reset ol {
+    padding: 10px 0;
+}
+.sf-reset ol li {
+    list-style: decimal;
+    margin-left: 20px;
+    padding: 2px;
+    padding-bottom: 20px;
+}
+.sf-reset ol ol li {
+    list-style-position: inside;
+    margin-left: 0;
+    white-space: nowrap;
+    font-size: 12px;
+    padding-bottom: 0;
+}
+.sf-reset li .selected {
+    background-color: #ffd;
+}
+.sf-button {
+    display: -moz-inline-box;
+    display: inline-block;
+    text-align: center;
+    vertical-align: middle;
+    border: 0;
+    background: transparent none;
+    text-transform: uppercase;
+    cursor: pointer;
+    font: bold 11px Arial, Helvetica, sans-serif;
+}
+.sf-button span {
+    text-decoration: none;
+    display: block;
+    height: 28px;
+    float: left;
+}
+.sf-button .border-l {
+    text-decoration: none;
+    display: block;
+    height: 28px;
+    float: left;
+    padding: 0 0 0 7px;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQtJREFUeNpiPHnyJAMakARiByDWYEGT8ADiYGVlZStubm5xlv///4MEQYoKZGRkQkRERLRYWVl5wYJQyXBZWdkwCQkJUxAHKgaWlAHSLqKiosb//v1DsYMFKGCvoqJiDmQzwXTAJYECulxcXNLoumCSoszMzDzoumDGghQwYZUECWIzkrAkSIIGOmlkLI10AiX//P379x8jIyMTNmPf/v79+ysLCwsvuiQoNi5//fr1Kch4dAyS3P/gwYMTQBP+wxwHw0xA4gkQ73v9+vUZdJ2w1Lf82bNn4iCHCQoKasHsZw4ODgbRIL8c+/Lly5M3b978Y2dn5wC6npkFLXnsAOKLjx49AmUHLYAAAwBoQubG016R5wAAAABJRU5ErkJggg==) no-repeat top left;
+}
+.sf-button .border-r {
+    padding: 0 7px 0 0;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
+}
+.sf-button .btn-bg {
+    padding: 0px 14px;
+    color: #636363;
+    line-height: 28px;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;
+}
+.sf-button:hover .border-l,
+.sf-button-selected .border-l {
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR9JREFUeNpi/P//PwMyOHfunDqQSgNiexZkibNnzxYBqZa3HOs5v7PcYQBLnjlzhg1IbfzIdsTjA/t+ht9Mr8GKwZL//v3r+sB+0OMN+zqIEf8gFMvJkyd1gXTOa9YNDP//otrPAtSV/Jp9HfPff78Z0AEL0LUeXxivMfxD0wXTqfjj/2ugkf+wSrL9/YtpJEyS4S8WI5Ek/+GR/POPFjr//cenE6/kP9q4Fo/kr39/mdj+M/zFkGQCSj5i+ccPjLJ/GBgkuYOHQR1sNDpmAkb2LBmWwL///zKCIxwZM0VHR18G6p4uxeLLAA4tJMwEshiou1iMxXaHLGswA+t/YbhORuQUv2DBAnCifvxzI+enP3dQJUFg/vz5sOzgBBBgAPxX9j0YnH4JAAAAAElFTkSuQmCC) no-repeat top left;
+}
+.sf-button:hover .border-r,
+.sf-button-selected .border-r {
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAT5JREFUeNpiPHv27BkGBoaDQDzLyMjoJgMSYHrM3WX8hn1d0f///88DFRYhSzIuv2X5H8Rg/SfKIPDTkYH/l80OINffxMTkF9O/f/8ZQPgnwyuGl+wrGd6x7vf49+9fO9jYf3+Bkkj4NesmBqAV+SdPntQC6vzHgIz//gOawbqOGchOxtAJwp8Zr4F0e7D8/fuPAR38/P8eZIo0yz8skv8YvoIk+YE6/zNgAyD7sRqLkPzzjxY6/+HS+R+fTkZ8djLh08lCUCcuSWawJGbwMTGwg7zyBatX2Bj5QZKPsBrLzaICktzN8g/NWEYGZgYZjoC/wMiei5FMpFh8QPSU6Ojoy3Cd7EwiDBJsDgxiLNY7gLrKQGIsHAxSDHxAO2TZ/b8D+TVxcXF9MCtYtLiKLgDpfUDVsxITE1GyA0CAAQA2E/N8VuHyAAAAAABJRU5ErkJggg==) right top no-repeat;
+}
+.sf-button:hover .btn-bg,
+.sf-button-selected .btn-bg {
+    color: #FFFFFF;
+    text-shadow:0 1px 1px #6b9311;
+    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAIAAAAvP0KbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEFJREFUeNpiPnv2LNMdvlymf///M/37B8R/QfQ/MP33L4j+B6Qh7L9//sHpf2h8MA1V+w/KRjYLaDaLCU8vQIABAFO3TxZriO4yAAAAAElFTkSuQmCC) repeat-x top left;
+}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
similarity index 99%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index f0bf4ecee0..6b8c045527 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -1,4 +1,3 @@
-<style type="text/css">
 /*
 Copyright (c) 2008, Yahoo! Inc. All rights reserved.
 Code licensed under the BSD License:
@@ -392,4 +391,3 @@ td.main, td.menu {
 .collapsed-menu span.icon img {
     display: inline !important;
 }
-</style>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
new file mode 100644
index 0000000000..b5a492d792
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -0,0 +1,330 @@
+.sf-minitoolbar {
+    display: none;
+
+    position: fixed;
+    bottom: 0;
+    right: 0;
+
+    padding: 5px 5px 0;
+
+    background-color: #f7f7f7;
+    background-image: -moz-linear-gradient(top, #e4e4e4, #ffffff);
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
+    background-image: -o-linear-gradient(top, #e4e4e4, #ffffff);
+    background: linear-gradient(top, #e4e4e4, #ffffff);
+
+    -moz-border-radius: 16px 0 0 0;
+    -webkit-border-radius: 16px 0 0 0;
+    border-radius: 16px 0 0 0;
+
+    z-index: 6000000;
+}
+
+.sf-toolbarreset {
+    position: fixed;
+    background-color: #f7f7f7;
+    left: 0;
+    right: 0;
+    height: 38px;
+    margin: 0;
+    padding: 0 40px 0 0;
+    z-index: 6000000;
+    font: 11px Verdana, Arial, sans-serif;
+    text-align: left;
+    color: #2f2f2f;
+
+    background-image: -moz-linear-gradient(top, #e4e4e4, #ffffff);
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
+    background-image: -o-linear-gradient(top, #e4e4e4, #ffffff);
+    background: linear-gradient(top, #e4e4e4, #ffffff);
+
+    bottom: 0;
+    border-top: 1px solid #bbb;
+}
+.sf-toolbarreset span,
+.sf-toolbarreset div {
+    font-size: 11px;
+}
+.sf-toolbarreset img {
+    width: auto;
+    display: inline;
+}
+
+.sf-toolbarreset .hide-button {
+    display: block;
+    position: absolute;
+    top: 12px;
+    right: 10px;
+    width: 15px;
+    height: 15px;
+    cursor: pointer;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAAllBMVEXDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PExMTPz8/Q0NDR0dHT09Pb29vc3Nzf39/h4eHi4uLj4+P6+vr7+/v8/Pz9/f3///+Nh2QuAAAAIXRSTlMABgwPGBswMzk8QktRV4SKjZOWmaKlq7TAxszb3urt+fy1vNEpAAAAiklEQVQIHUXBBxKCQBREwRFzDqjoGh+C2YV//8u5Sll2S0E/dof1tKdKM6GyqCto7PjZRJIS/mbSELgXOSd/BzpKIH1ZefVWpDDTHsi8mZVnwImPi5ndCLbaAZk3M58Bay0h9VbeSvMpjDUAHj4jL55AW1rxN5fU2PLjIgVRzNdxVFOlGzvnJi0Fb1XNGBHA9uQOAAAAAElFTkSuQmCC');
+}
+
+.sf-toolbar-block {
+    white-space: nowrap;
+    color: #2f2f2f;
+    display: block;
+    min-height: 28px;
+    border-right: 1px solid #e4e4e4;
+    padding: 0;
+    float: left;
+    cursor: default;
+}
+
+.sf-toolbar-block span {
+    display: inline-block;
+}
+
+.sf-toolbar-block .sf-toolbar-info-piece {
+    padding-bottom: 5px;
+}
+
+.sf-toolbar-block .sf-toolbar-info-piece:last-child {
+    padding-bottom: 0;
+}
+
+.sf-toolbar-block .sf-toolbar-info-piece a,
+.sf-toolbar-block .sf-toolbar-info-piece abbr {
+    color: #2f2f2f;
+}
+
+.sf-toolbar-block .sf-toolbar-info-piece b {
+    display: inline-block;
+    width: 110px;
+}
+
+.sf-toolbar-block .sf-toolbar-info-with-next-pointer:after {
+    content: ' :: ';
+    color: #999;
+}
+
+.sf-toolbar-block .sf-toolbar-info-with-delimiter {
+    border-right: 1px solid #999;
+    padding-right: 5px;
+    margin-right: 5px;
+}
+
+.sf-toolbar-block .sf-toolbar-info {
+    display: none;
+    position: absolute;
+    background-color: #fff;
+    border: 1px solid #bbb;
+    padding: 10px 8px;
+    margin-left: -1px;
+
+    bottom: 38px;
+    border-bottom-width: 0;
+}
+
+.sf-toolbar-block .sf-toolbar-info:empty {
+    visibility: hidden;
+}
+
+.sf-toolbar-block .sf-toolbar-status {
+    display: inline-block;
+    color: #fff;
+    background-color: #666;
+    padding: 3px 6px;
+    border-radius: 3px;
+    margin-bottom: 2px;
+    vertical-align: middle;
+    min-width: 6px;
+    min-height: 13px;
+}
+
+.sf-toolbar-block .sf-toolbar-status abbr {
+    color: #fff;
+    border-bottom: 1px dotted black;
+}
+
+.sf-toolbar-block .sf-toolbar-status-green {
+    background-color: #759e1a;
+}
+
+.sf-toolbar-block .sf-toolbar-status-red {
+    background-color: #a33;
+}
+
+.sf-toolbar-block .sf-toolbar-status-yellow {
+    background-color: #ffcc00;
+    color: #000;
+}
+
+.sf-toolbar-block .sf-toolbar-status-black {
+    background-color: #000;
+}
+
+.sf-toolbar-block .sf-toolbar-icon {
+    display: block;
+}
+
+.sf-toolbar-block .sf-toolbar-icon > a,
+.sf-toolbar-block .sf-toolbar-icon > span {
+    display: block;
+    text-decoration: none;
+    margin: 0;
+    padding: 5px 8px;
+    min-width: 20px;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.sf-toolbar-block .sf-toolbar-icon > a,
+.sf-toolbar-block .sf-toolbar-icon > a:link
+.sf-toolbar-block .sf-toolbar-icon > a:hover {
+    color: black !important;
+}
+
+.sf-toolbar-block .sf-toolbar-icon img {
+    border-width: 0;
+    vertical-align: middle;
+}
+
+.sf-toolbar-block .sf-toolbar-icon img + span {
+    margin-left: 5px;
+    margin-top: 2px;
+}
+
+.sf-toolbar-block .sf-toolbar-icon .sf-toolbar-status {
+    border-radius: 12px;
+    border-bottom-left-radius: 0;
+    margin-top: 0;
+}
+
+.sf-toolbar-block .sf-toolbar-info-method {
+    border-bottom: 1px dashed #ccc;
+    cursor: help;
+}
+
+.sf-toolbar-block .sf-toolbar-info-method[onclick=""] {
+    border-bottom: none;
+    cursor: inherit;
+}
+
+.sf-toolbar-info-php {}
+.sf-toolbar-info-php-ext {}
+
+.sf-toolbar-info-php-ext .sf-toolbar-status {
+    margin-left: 2px;
+}
+
+.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
+    margin-left: 0;
+}
+
+.sf-toolbar-block a .sf-toolbar-info-piece-additional,
+.sf-toolbar-block a .sf-toolbar-info-piece-additional-detail {
+    display: inline-block;
+}
+
+.sf-toolbar-block a .sf-toolbar-info-piece-additional:empty,
+.sf-toolbar-block a .sf-toolbar-info-piece-additional-detail:empty {
+    display: none;
+}
+
+.sf-toolbarreset:hover {
+    box-shadow: rgba(0, 0, 0, 0.3) 0 0 50px;
+}
+
+.sf-toolbar-block:hover {
+    box-shadow: rgba(0, 0, 0, 0.3) 0 0 5px;
+}
+
+.sf-toolbar-block:hover .sf-toolbar-icon {
+    background-color: #fff;
+}
+.sf-toolbar-block:hover .sf-toolbar-info {
+    display: block;
+}
+
+/***** Override the setting when the toolbar is on the top *****/
+{% if position == 'top' %}
+    .sf-minitoolbar {
+        top: 0;
+        bottom: auto;
+        right: 0;
+
+        background-color: #f7f7f7;
+
+        background-image: -moz-linear-gradient(225deg, #e4e4e4, #ffffff);
+        background-image: -webkit-gradient(linear, 100% 0%, 0% 0%, from(#e4e4e4), to(#ffffff));
+        background-image: -o-linear-gradient(135deg, #e4e4e4, #ffffff);
+        background: linear-gradient(225deg, #e4e4e4, #ffffff);
+
+        -moz-border-radius: 0 0 0 16px;
+        -webkit-border-radius: 0 0 0 16px;
+        border-radius: 0 0 0 16px;
+    }
+
+    .sf-toolbarreset {
+        background-image: -moz-linear-gradient(225deg, #e4e4e4, #ffffff);
+        background-image: -webkit-gradient(linear, 100% 0%, 0% 0%, from(#e4e4e4), to(#ffffff));
+        background-image: -o-linear-gradient(135deg, #e4e4e4, #ffffff);
+        background: linear-gradient(225deg, #e4e4e4, #ffffff);
+
+        top: 0;
+        bottom: auto;
+        border-bottom: 1px solid #bbb;
+    }
+
+    .sf-toolbar-block .sf-toolbar-info {
+        top: 39px;
+        bottom: auto;
+        border-top-width: 0;
+        border-bottom: 1px solid #bbb;
+    }
+{% endif %}
+
+{% if not floatable %}
+    .sf-toolbarreset {
+        position: static;
+        background: #cbcbcb;
+
+        background-image: -moz-linear-gradient(90deg, #cbcbcb, #e8e8e8); !important;
+        background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, from(#cbcbcb), to(#e8e8e8)); !important;
+        background-image: -o-linear-gradient(180deg, #cbcbcb, #e8e8e8); !important;
+        background: linear-gradient(90deg, #cbcbcb, #e8e8e8); !important;
+    }
+
+    .sf-toolbarreset abbr {
+        border-bottom: 1px dotted #000000;
+        cursor: help;
+    }
+{% endif %}
+
+/***** Media query *****/
+@media screen and (max-width: 779px) {
+    .sf-toolbar-block .sf-toolbar-icon > * > :first-child ~ * {
+        display: none;
+    }
+
+    .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional,
+    .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional-detail {
+        display: none !important;
+    }
+}
+
+@media screen and (min-width: 880px) {
+    .sf-toolbar-block .sf-toolbar-icon a[href$="config"] .sf-toolbar-info-piece-additional {
+        display: inline-block;
+    }
+}
+
+@media screen and (min-width: 980px) {
+    .sf-toolbar-block .sf-toolbar-icon a[href$="security"] .sf-toolbar-info-piece-additional {
+        display: inline-block;
+    }
+}
+
+@media screen and (max-width: 1179px) {
+    .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional {
+        display: none;
+    }
+}
+
+@media screen and (max-width: 1439px) {
+    .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional-detail {
+        display: none;
+    }
+}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
index 2697698377..0d660ba449 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@@ -1,6 +1,8 @@
 <!-- START of Symfony2 Web Debug Toolbar -->
 {% if 'normal' != position %}
-    {% include '@WebProfiler/Profiler/toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
+    <style type="text/css">
+        {% include '@WebProfiler/Profiler/toolbar.css.twig' with { 'position': position, 'floatable': true } %}
+    </style>
     <div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar">
         <a href="javascript:void(0);" title="Show Symfony toolbar" onclick="
             var elem = this.parentNode;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
deleted file mode 100644
index bb4ca082a4..0000000000
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
+++ /dev/null
@@ -1,332 +0,0 @@
-<style type="text/css">
-    .sf-minitoolbar {
-        display: none;
-
-        position: fixed;
-        bottom: 0;
-        right: 0;
-
-        padding: 5px 5px 0;
-
-        background-color: #f7f7f7;
-        background-image: -moz-linear-gradient(top, #e4e4e4, #ffffff);
-        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
-        background-image: -o-linear-gradient(top, #e4e4e4, #ffffff);
-        background: linear-gradient(top, #e4e4e4, #ffffff);
-
-        -moz-border-radius: 16px 0 0 0;
-        -webkit-border-radius: 16px 0 0 0;
-        border-radius: 16px 0 0 0;
-
-        z-index: 6000000;
-    }
-
-    .sf-toolbarreset {
-        position: fixed;
-        background-color: #f7f7f7;
-        left: 0;
-        right: 0;
-        height: 38px;
-        margin: 0;
-        padding: 0 40px 0 0;
-        z-index: 6000000;
-        font: 11px Verdana, Arial, sans-serif;
-        text-align: left;
-        color: #2f2f2f;
-
-        background-image: -moz-linear-gradient(top, #e4e4e4, #ffffff);
-        background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
-        background-image: -o-linear-gradient(top, #e4e4e4, #ffffff);
-        background: linear-gradient(top, #e4e4e4, #ffffff);
-
-        bottom: 0;
-        border-top: 1px solid #bbb;
-    }
-    .sf-toolbarreset span,
-    .sf-toolbarreset div {
-        font-size: 11px;
-    }
-    .sf-toolbarreset img {
-        width: auto;
-        display: inline;
-    }
-
-    .sf-toolbarreset .hide-button {
-        display: block;
-        position: absolute;
-        top: 12px;
-        right: 10px;
-        width: 15px;
-        height: 15px;
-        cursor: pointer;
-        background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAAllBMVEXDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PExMTPz8/Q0NDR0dHT09Pb29vc3Nzf39/h4eHi4uLj4+P6+vr7+/v8/Pz9/f3///+Nh2QuAAAAIXRSTlMABgwPGBswMzk8QktRV4SKjZOWmaKlq7TAxszb3urt+fy1vNEpAAAAiklEQVQIHUXBBxKCQBREwRFzDqjoGh+C2YV//8u5Sll2S0E/dof1tKdKM6GyqCto7PjZRJIS/mbSELgXOSd/BzpKIH1ZefVWpDDTHsi8mZVnwImPi5ndCLbaAZk3M58Bay0h9VbeSvMpjDUAHj4jL55AW1rxN5fU2PLjIgVRzNdxVFOlGzvnJi0Fb1XNGBHA9uQOAAAAAElFTkSuQmCC');
-    }
-
-    .sf-toolbar-block {
-        white-space: nowrap;
-        color: #2f2f2f;
-        display: block;
-        min-height: 28px;
-        border-right: 1px solid #e4e4e4;
-        padding: 0;
-        float: left;
-        cursor: default;
-    }
-
-    .sf-toolbar-block span {
-        display: inline-block;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-piece {
-        padding-bottom: 5px;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-piece:last-child {
-        padding-bottom: 0;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-piece a,
-    .sf-toolbar-block .sf-toolbar-info-piece abbr {
-        color: #2f2f2f;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-piece b {
-        display: inline-block;
-        width: 110px;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-with-next-pointer:after {
-        content: ' :: ';
-        color: #999;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-with-delimiter {
-        border-right: 1px solid #999;
-        padding-right: 5px;
-        margin-right: 5px;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info {
-        display: none;
-        position: absolute;
-        background-color: #fff;
-        border: 1px solid #bbb;
-        padding: 10px 8px;
-        margin-left: -1px;
-
-        bottom: 38px;
-        border-bottom-width: 0;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info:empty {
-        visibility: hidden;
-    }
-
-    .sf-toolbar-block .sf-toolbar-status {
-        display: inline-block;
-        color: #fff;
-        background-color: #666;
-        padding: 3px 6px;
-        border-radius: 3px;
-        margin-bottom: 2px;
-        vertical-align: middle;
-        min-width: 6px;
-        min-height: 13px;
-    }
-
-    .sf-toolbar-block .sf-toolbar-status abbr {
-        color: #fff;
-        border-bottom: 1px dotted black;
-    }
-
-    .sf-toolbar-block .sf-toolbar-status-green {
-        background-color: #759e1a;
-    }
-
-    .sf-toolbar-block .sf-toolbar-status-red {
-        background-color: #a33;
-    }
-
-    .sf-toolbar-block .sf-toolbar-status-yellow {
-        background-color: #ffcc00;
-        color: #000;
-    }
-
-    .sf-toolbar-block .sf-toolbar-status-black {
-        background-color: #000;
-    }
-
-    .sf-toolbar-block .sf-toolbar-icon {
-        display: block;
-    }
-
-    .sf-toolbar-block .sf-toolbar-icon > a,
-    .sf-toolbar-block .sf-toolbar-icon > span {
-        display: block;
-        text-decoration: none;
-        margin: 0;
-        padding: 5px 8px;
-        min-width: 20px;
-        text-align: center;
-        vertical-align: middle;
-    }
-
-    .sf-toolbar-block .sf-toolbar-icon > a,
-    .sf-toolbar-block .sf-toolbar-icon > a:link
-    .sf-toolbar-block .sf-toolbar-icon > a:hover {
-        color: black !important;
-    }
-
-    .sf-toolbar-block .sf-toolbar-icon img {
-        border-width: 0;
-        vertical-align: middle;
-    }
-
-    .sf-toolbar-block .sf-toolbar-icon img + span {
-        margin-left: 5px;
-        margin-top: 2px;
-    }
-
-    .sf-toolbar-block .sf-toolbar-icon .sf-toolbar-status {
-        border-radius: 12px;
-        border-bottom-left-radius: 0;
-        margin-top: 0;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-method {
-        border-bottom: 1px dashed #ccc;
-        cursor: help;
-    }
-
-    .sf-toolbar-block .sf-toolbar-info-method[onclick=""] {
-        border-bottom: none;
-        cursor: inherit;
-    }
-
-    .sf-toolbar-info-php {}
-    .sf-toolbar-info-php-ext {}
-
-    .sf-toolbar-info-php-ext .sf-toolbar-status {
-        margin-left: 2px;
-    }
-
-    .sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
-        margin-left: 0;
-    }
-
-    .sf-toolbar-block a .sf-toolbar-info-piece-additional,
-    .sf-toolbar-block a .sf-toolbar-info-piece-additional-detail {
-        display: inline-block;
-    }
-
-    .sf-toolbar-block a .sf-toolbar-info-piece-additional:empty,
-    .sf-toolbar-block a .sf-toolbar-info-piece-additional-detail:empty {
-        display: none;
-    }
-
-    .sf-toolbarreset:hover {
-        box-shadow: rgba(0, 0, 0, 0.3) 0 0 50px;
-    }
-
-    .sf-toolbar-block:hover {
-        box-shadow: rgba(0, 0, 0, 0.3) 0 0 5px;
-    }
-
-    .sf-toolbar-block:hover .sf-toolbar-icon {
-        background-color: #fff;
-    }
-    .sf-toolbar-block:hover .sf-toolbar-info {
-        display: block;
-    }
-
-    /***** Override the setting when the toolbar is on the top *****/
-    {% if position == 'top' %}
-        .sf-minitoolbar {
-            top: 0;
-            bottom: auto;
-            right: 0;
-
-            background-color: #f7f7f7;
-
-            background-image: -moz-linear-gradient(225deg, #e4e4e4, #ffffff);
-            background-image: -webkit-gradient(linear, 100% 0%, 0% 0%, from(#e4e4e4), to(#ffffff));
-            background-image: -o-linear-gradient(135deg, #e4e4e4, #ffffff);
-            background: linear-gradient(225deg, #e4e4e4, #ffffff);
-
-            -moz-border-radius: 0 0 0 16px;
-            -webkit-border-radius: 0 0 0 16px;
-            border-radius: 0 0 0 16px;
-        }
-
-        .sf-toolbarreset {
-            background-image: -moz-linear-gradient(225deg, #e4e4e4, #ffffff);
-            background-image: -webkit-gradient(linear, 100% 0%, 0% 0%, from(#e4e4e4), to(#ffffff));
-            background-image: -o-linear-gradient(135deg, #e4e4e4, #ffffff);
-            background: linear-gradient(225deg, #e4e4e4, #ffffff);
-
-            top: 0;
-            bottom: auto;
-            border-bottom: 1px solid #bbb;
-        }
-
-        .sf-toolbar-block .sf-toolbar-info {
-            top: 39px;
-            bottom: auto;
-            border-top-width: 0;
-            border-bottom: 1px solid #bbb;
-        }
-    {% endif %}
-
-    {% if not floatable %}
-        .sf-toolbarreset {
-            position: static;
-            background: #cbcbcb;
-
-            background-image: -moz-linear-gradient(90deg, #cbcbcb, #e8e8e8); !important;
-            background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, from(#cbcbcb), to(#e8e8e8)); !important;
-            background-image: -o-linear-gradient(180deg, #cbcbcb, #e8e8e8); !important;
-            background: linear-gradient(90deg, #cbcbcb, #e8e8e8); !important;
-        }
-
-        .sf-toolbarreset abbr {
-            border-bottom: 1px dotted #000000;
-            cursor: help;
-        }
-    {% endif %}
-
-    /***** Media query *****/
-    @media screen and (max-width: 779px) {
-        .sf-toolbar-block .sf-toolbar-icon > * > :first-child ~ * {
-            display: none;
-        }
-
-        .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional,
-        .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional-detail {
-            display: none !important;
-        }
-    }
-
-    @media screen and (min-width: 880px) {
-        .sf-toolbar-block .sf-toolbar-icon a[href$="config"] .sf-toolbar-info-piece-additional {
-            display: inline-block;
-        }
-    }
-
-    @media screen and (min-width: 980px) {
-        .sf-toolbar-block .sf-toolbar-icon a[href$="security"] .sf-toolbar-info-piece-additional {
-            display: inline-block;
-        }
-    }
-
-    @media screen and (max-width: 1179px) {
-        .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional {
-            display: none;
-        }
-    }
-
-    @media screen and (max-width: 1439px) {
-        .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional-detail {
-            display: none;
-        }
-    }
-</style>