diff --git a/prefs_manage.php b/prefs_manage.php
index 722df831f0..3dddc702eb 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -306,7 +306,7 @@ if (@file_exists('setup/index.php') && ! @file_exists(CONFIG_FILE)) {
             <form class="group-cnt prefs-form disableAjax" name="prefs_export"
                   action="prefs_manage.php" method="post">
                 <?php echo Url::getHiddenInputs(); ?>
-                <div style="padding-bottom:0.5em">
+                <div>
                     <input type="radio" id="export_text_file" name="export_type"
                            value="text_file" checked="checked" />
                     <label for="export_text_file">
diff --git a/templates/columns_definitions/column_name.twig b/templates/columns_definitions/column_name.twig
index 82b7f8ed26..15d063c396 100644
--- a/templates/columns_definitions/column_name.twig
+++ b/templates/columns_definitions/column_name.twig
@@ -32,8 +32,7 @@
 {% if cfg_relation['centralcolumnswork']
     and not (column_meta['column_status'] is defined
         and not column_meta['column_status']['isEditable']) %}
-    <p style="font-size:80%;margin:5px 2px"
-       id="central_columns_{{ column_number }}_{{ ci - ci_offset }}">
+    <p class="column_name" id="central_columns_{{ column_number }}_{{ ci - ci_offset }}">
         <a data-maxrows="{{ max_rows }}"
             href="#"
             class="central_columns_dialog">
diff --git a/templates/select_all.twig b/templates/select_all.twig
index b9c21021d7..41f5297cd5 100644
--- a/templates/select_all.twig
+++ b/templates/select_all.twig
@@ -3,4 +3,4 @@
 <input type="checkbox" id="{{ form_name }}_checkall" class="checkall_box"
     title="{% trans 'Check all' %}" />
 <label for="{{ form_name }}_checkall">{% trans 'Check all' %}</label>
-<i style="margin-left: 2em">{% trans 'With selected:' %}</i>
+<em class="with-selected">{% trans 'With selected:' %}</em>
diff --git a/themes/metro/css/common.css.php b/themes/metro/css/common.css.php
index a5e9c8c80b..56086b02a6 100644
--- a/themes/metro/css/common.css.php
+++ b/themes/metro/css/common.css.php
@@ -951,6 +951,9 @@ td .icon {
     margin-<?php echo $right; ?>: .3em;
     margin-<?php echo $left; ?>: .6em;
 }
+.with-selected {
+    margin-<?php echo $left; ?>: 2em;
+}
 
 /* message boxes: error, confirmation */
 #pma_errors, #pma_demo, #pma_footer {
@@ -1057,6 +1060,11 @@ fieldset.confirmation legend
 
 /* end messageboxes */
 
+.column_name {
+    font-size: 80%;
+    margin: 5px 2px;
+}
+
 .new_central_col{
     width:              100%;
 }
@@ -3963,4 +3971,4 @@ body .ui-dialog .ui-dialog-buttonpane button.ui-state-hover {
 body .ui-dialog .ui-dialog-buttonpane button.ui-state-active {
     background-color: #333;
     border: 1px solid #333;
-}
\ No newline at end of file
+}
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 53e188ba51..84a9b5cefc 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -423,6 +423,9 @@ td .icon {
     margin-<?php echo $right; ?>: 0.3em;
     margin-<?php echo $left; ?>: 0.6em;
 }
+.with-selected {
+    margin-<?php echo $left; ?>: 2em;
+}
 
 /* message boxes: error, confirmation */
 #pma_errors, #pma_demo, #pma_footer {
@@ -664,6 +667,10 @@ form.login label {
 .column_attribute {
     font-size: 70%;
 }
+.column_name {
+    font-size: 80%;
+    margin: 5px 2px;
+}
 
 .cfg_dbg_demo{
     margin: 0.5em 1em 0.5em 1em;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 476812ccf6..02c922bab9 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -719,6 +719,9 @@ td .icon {
     margin-<?php echo $right; ?>: .3em;
     margin-<?php echo $left; ?>: .6em;
 }
+.with-selected {
+    margin-<?php echo $left; ?>: 2em;
+}
 
 /* message boxes: error, confirmation */
 #pma_errors, #pma_demo, #pma_footer {
@@ -951,6 +954,10 @@ form.login select {
 .column_attribute {
     font-size: 70%;
 }
+.column_name {
+    font-size: 80%;
+    margin: 5px 2px;
+}
 
 .cfg_dbg_demo{
     margin: 0.5em 1em 0.5em 1em;