diff --git a/js/config.js b/js/config.js
index 4f4a89d73..612425bf9 100644
--- a/js/config.js
+++ b/js/config.js
@@ -645,8 +645,8 @@ $(function() {
             var hide_id = show_id.match(/local_storage$/)
                 ? show_id.replace(/local_storage$/, 'text_file')
                 : show_id.replace(/text_file$/, 'local_storage');
-        $('#opts_'+hide_id).hide('fast');
-        $('#opts_'+show_id).show('fast');
+        $('#opts_'+hide_id).hide();
+        $('#opts_'+show_id).show();
     });
 
     // detect localStorage state
diff --git a/prefs_manage.php b/prefs_manage.php
index 4d972d495..4741855a5 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -139,27 +139,28 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                 echo PMA_generate_common_hidden_inputs() . "\n";
                 ?>
                 <input type="hidden" name="json" value="" />
-                <div style="padding-bottom:0.5em">
+                <div>
                     <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" />
                     <label for="import_text_file"><?php echo __('Import from text file') ?></label>
                     <br />
                     <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" />
                     <label for="import_local_storage"><?php echo __('Import from browser\'s storage') ?></label>
                 </div>
-                <div id="opts_import_text_file">
+                <div id="opts_import_text_file" class="prefsmanage_opts">
                     <label for="input_import_file"><?php echo __('Location of the text file'); ?></label>
-                    <input style="margin: 5px" type="file" name="import_file" id="input_import_file" />
+                    <input type="file" name="import_file" id="input_import_file" />
                 </div>
-                <div id="opts_import_local_storage" style="display:none">
-                    <span class="localStorage-supported">
+                <div id="opts_import_local_storage" class="prefsmanage_opts" style="display:none">
+                    <div class="localStorage-supported">
                         <?php echo __('Settings will be imported from your browser\'s local storage.') ?>
+                        <br />
                         <span class="localStorage-exists">
                             <?php echo __('Saved on: __DATE__') ?>
                         </span>
                         <span class="localStorage-empty">
                             <?php  PMA_Message::notice(__('You have no saved settings!'))->display() ?>
                         </span>
-                    </span>
+                    </div>
                     <span class="localStorage-unsupported">
                         <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
                     </span>
@@ -189,7 +190,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
                     <input type="radio" id="export_local_storage" name="export_type" value="local_storage" disabled="disabled" />
                     <label for="export_local_storage"><?php echo __('Save to browser\'s storage') ?></label>
                 </div>
-                <div id="opts_export_local_storage" style="display:none">
+                <div id="opts_export_local_storage" class="prefsmanage_opts" style="display:none">
                     <span class="localStorage-supported">
                         <?php echo __('Settings will be saved in your browser\'s local storage.') ?>
                         <span class="localStorage-exists">
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 754c34a9c..329ea80d7 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1438,3 +1438,7 @@ fieldset .group-field th {
 .click-hide-message {
     cursor: pointer;
 }
+
+.prefsmanage_opts {
+    margin-<?php echo $left; ?>: 2em;
+}
\ No newline at end of file