diff --git a/index.php b/index.php
index bd4de1a134..7da11334bc 100644
--- a/index.php
+++ b/index.php
@@ -558,7 +558,7 @@ if ($server > 0) {
             . '%sFind out why%s. '
         );
         if ($cfg['ZeroConf'] == true) {
-            $msg_text .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' .
+            $msg_text .= '<br>' .
                 __(
                     'Or alternately go to \'Operations\' tab of any database '
                     . 'to set it up there.'
diff --git a/js/ajax.js b/js/ajax.js
index bac829d9f0..04ea405006 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -442,7 +442,7 @@ var AJAX = {
                     msg = data._errSubmitMsg;
                 }
                 if (data._errors) {
-                    $('<div/>', {id : 'pma_errors'})
+                    $('<div/>', {id : 'pma_errors', class : 'clearfloat'})
                         .insertAfter('#selflink')
                         .append(data._errors);
                     // bind for php error reporting forms (bottom)
diff --git a/libraries/Footer.php b/libraries/Footer.php
index dac15c0e9b..dfea679edb 100644
--- a/libraries/Footer.php
+++ b/libraries/Footer.php
@@ -217,11 +217,10 @@ class Footer
      */
     public function getErrorMessages()
     {
-        $retval = '<div class="clearfloat" id="pma_errors">';
+        $retval = '';
         if ($GLOBALS['error_handler']->hasDisplayErrors()) {
             $retval .= $GLOBALS['error_handler']->getDispErrors();
         }
-        $retval .= '</div>';
 
         /**
          * Report php errors
@@ -341,7 +340,9 @@ class Footer
                 $this->_scripts->addCode(
                     'var debugSQLInfo = ' . $this->getDebugMessage() . ';'
                 );
+                $retval .= '<div class="clearfloat" id="pma_errors">';
                 $retval .= $this->getErrorMessages();
+                $retval .= '</div>';
                 $retval .= $this->_scripts->getDisplay();
                 if ($GLOBALS['cfg']['DBG']['demo']) {
                     $retval .= '<div id="pma_demo">';
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index de8b70f647..2b17bcd491 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -422,15 +422,22 @@ div.error {
     <?php
     if ($GLOBALS['text_dir'] === 'ltr') { ?>
         background-position: 10px 50%;
-        padding:            0.1em 0.1em 0.1em 36px;
+        padding:            0.1em 0.1em 0.1em 42px;
     <?php
     } else { ?>
         background-position: 99% 50%;
-        padding:            0.1em 46px 0.1em 0.1em;
+        padding:            0.1em 40px 0.1em 0.1em;
         <?php
     }
 ?>
 }
+div.success img.icon,
+div.notice img.icon,
+div.error img.icon {
+    display: block;
+    float:              <?php echo $left; ?>;
+    margin-<?php echo $left; ?>: -22px;
+}
 
 .success {
     color:              #000000;
@@ -1249,7 +1256,7 @@ div#queryboxcontainer div#bookmarkoptions {
 
 li.no_bullets {
     list-style-type:none !important;
-    margin-left: -25px !important;      //align with other list items which have bullets
+    margin-<?php echo $left; ?>: -25px !important;      //align with other list items which have bullets
 }
 
 /* end iconic view for ul items */