diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 846016919..e91eab163 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -102,7 +102,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
     }
 
     if ($include_box) {
-        $button .= '<div class="nowrap">';
+        $button .= '<span class="nowrap">';
     }
 
     if ($include_icon) {
@@ -120,7 +120,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
     }
 
     if ($include_box) {
-        $button .= '</div>';
+        $button .= '</span>';
     }
 
     return $button;
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index f828fa2dd..b2dafa05e 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -610,6 +610,10 @@ td.disabled {
     background-color:   #cccccc;
 }
 
+.nowrap {
+    white-space:        nowrap;
+}
+
 /**
  * login form
  */
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index c04bedb56..9a8e6d1e5 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -585,6 +585,10 @@ td.disabled {
     background-color:   #cccccc;
 }
 
+.nowrap {
+    white-space:        nowrap;
+}
+
 /**
  * login form
  */