diff --git a/main.php b/main.php
index 360e98881..1b385dd52 100644
--- a/main.php
+++ b/main.php
@@ -171,6 +171,14 @@ echo PMA_Config::getFontsizeForm();
 echo '</li>';
 
 echo '</ul>';
+
+// User preferences
+
+echo '<ul>';
+echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+                    './user_preferences.php?' . $common_url_query);
+echo '<ul>';
+
 echo '</div>';
 
 
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index ebf48bb36..c6408de4e 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -36,7 +36,7 @@ header('Content-Type: text/css; charset=UTF-8');
 
 // Cache output in client - the nocache query parameter makes sure that this
 // file is reloaded when config changes
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
+//header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
 
 $_SESSION['PMA_Theme_Manager']->printCss(PMA_FRAME);
 ?>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b3c510154..36e689a2a 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1066,6 +1066,10 @@ li#li_switch_dbstats {
 li#li_flush_privileges {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
 }
+
+li#li_user_preferences {
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
+}
 /* END iconic view for ul items */
 <?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>