diff --git a/libraries/display_structure.inc.php b/libraries/display_structure.inc.php
index 949acb821a..47db3a2a8c 100644
--- a/libraries/display_structure.inc.php
+++ b/libraries/display_structure.inc.php
@@ -212,6 +212,8 @@ $response->addHTML(
  * Work on the table
  */
 
+$response->addHTML('<div id="structure-action-links">');
+
 if ($tbl_is_view) {
     $response->addHTML(PMA_getHtmlForEditView($url_params));
 }
@@ -222,6 +224,8 @@ $response->addHTML(
     )
 );
 
+$response->addHTML('</div>');
+
 if (! $tbl_is_view && ! $db_is_system_schema) {
     $response->addHTML('<br />');
     $response->addHTML(PMA_getHtmlForAddColumn($columns_list));
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 98ec8c0dc7..4d8a65c9c1 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -378,8 +378,7 @@ img.lightbulb {
 /* leave some space between icons and text */
 .icon {
     vertical-align:     middle;
-    margin-right:       0.3em;
-    margin-left:        0.3em;
+    margin-<?php echo $left; ?>:        0.3em;
 }
 
 /* no extra space in table cells */
@@ -1613,7 +1612,16 @@ input#input_import_file {
     padding: 0.3em;
     margin: 0.1em;
 }
-
+#structure-action-links a {
+    margin-<?php echo $right; ?>: 1em;
+}
+#addColumns input[type="radio"] {
+    margin: 0;
+    margin-<?php echo $left; ?>: 1em;
+}
+#addColumns input[type="submit"] {
+    margin-<?php echo $left; ?>: 1em;
+}
 .margin#change_column_dialog {
     margin: 0 .5em;
 }
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 9a19c94760..698cd5fa20 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2041,6 +2041,13 @@ input#input_import_file {
     padding: 0.3em;
     margin: 0.1em;
 }
+#structure-action-links a {
+    margin-<?php echo $right; ?>: 1em;
+}
+#addColumns input[type="radio"] {
+    margin: 3px 0 0;
+    margin-<?php echo $left; ?>: 1em;
+}
 /**
  * Indexes
  */
diff --git a/themes/sprites.css.php b/themes/sprites.css.php
index 2c12589a41..5ece1e84aa 100644
--- a/themes/sprites.css.php
+++ b/themes/sprites.css.php
@@ -18,7 +18,8 @@ if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
 ?>
 /* Icon sprites */
 .icon {
-    margin: 0 .3em;
+    margin: 0;
+    margin-<?php echo $left; ?>: .3em;
     padding: 0 !important;
     width: 16px;
     height: 16px;