diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css
index 86454c1e44..22c9387ef5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css
@@ -83,6 +83,10 @@ build: 56
     color: #AA3333;
     background: #f9ecec;
 }
+.sf-exceptionreset #logs .traces li.warning {
+    font-style: normal;
+    background: #ffcc00;
+}
 /* fix for Opera not liking empty <li> */
 .sf-exceptionreset .traces li:after {
     content: "\00A0";
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig
index 88a35284c4..f75ec585fc 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig
@@ -1,7 +1,7 @@
 <ol class="traces logs">
     {% for log in logs %}
-        <li{% if log.priorityName in ['EMERG', 'ERR', 'CRIT', 'ALERT', 'ERROR', 'CRITICAL'] %} class="error"{% endif %}>
-            {{ log.message }}
+        <li{% if log.priority >= 400 %} class="error"{% elseif log.priority >= 300 %} class="warning"{% endif %}>
+            {{ log.priorityName }} - {{ log.message }}
         </li>
     {% endfor %}
 </ol>