diff --git a/ChangeLog b/ChangeLog
index 312e148fd6..4ae25e9a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 + Display direction (horizontal/vertical) no longer displayed by default
 + Shift/click support in database Structure
 + Show/hide column in table Browse
+- bug #3353856 [AJAX] AJAX dialogs use wrong font-size
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
@@ -39,6 +40,8 @@ phpMyAdmin - ChangeLog
 - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option
 - bug #3340151 [export] Working SQL query exports error page
 - bug #3353649 [interface] "Create an index on X columns" form not validated
+- bug #3350790 [interface] JS error in Table->Structure->Index->Edit
+- bug #3353811 [interface] Info message has "error" class
 
 3.4.3.1 (2011-07-02)
 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
diff --git a/js/db_routines.js b/js/db_routines.js
index 95254ca064..ceb09626dd 100644
--- a/js/db_routines.js
+++ b/js/db_routines.js
@@ -308,7 +308,7 @@ $(document).ready(function() {
                 /**
                  * Display the dialog to the user
                  */
-                $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({
+                $ajaxDialog = $('<div>'+data.message+'</div>').dialog({
                                 width: 700,  // TODO: make a better decision about the size
                                 height: 550, // of the dialog based on the size of the viewport
                                 buttons: button_options,
@@ -529,7 +529,7 @@ $(document).ready(function() {
                     /**
                      * Display the dialog to the user
                      */
-                    $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({
+                    $ajaxDialog = $('<div>'+data.message+'</div>').dialog({
                                     width: 650,  // TODO: make a better decision about the size
                                                  // of the dialog based on the size of the viewport
                                     buttons: button_options,
diff --git a/js/functions.js b/js/functions.js
index e25ec982ea..9cdb44e751 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2445,7 +2445,7 @@ $(document).ready(function() {
                 /**
                  * Display the dialog to the user
                  */
-                var $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({
+                var $ajaxDialog = $('<div>'+data.message+'</div>').dialog({
                                       width: 500,
                                       buttons: button_options,
                                       title: data.title
diff --git a/js/indexes.js b/js/indexes.js
index 9b64d92048..ef6f877bdd 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -17,24 +17,24 @@ function checkIndexName()
     }
 
     // Gets the elements pointers
-    var the_idx_name = document.forms['index_frm'].elements['index'];
-    var the_idx_type = document.forms['index_frm'].elements['index_type'];
+    var the_idx_name = document.forms['index_frm'].elements['index[Key_name]'];
+    var the_idx_type = document.forms['index_frm'].elements['index[Index_type]'];
 
     // Index is a primary key
     if (the_idx_type.options[0].value == 'PRIMARY' && the_idx_type.options[0].selected) {
-        document.forms['index_frm'].elements['index'].value = 'PRIMARY';
+        document.forms['index_frm'].elements['index[Key_name]'].value = 'PRIMARY';
         if (typeof(the_idx_name.disabled) != 'undefined') {
-            document.forms['index_frm'].elements['index'].disabled = true;
+            document.forms['index_frm'].elements['index[Key_name]'].disabled = true;
         }
     }
 
     // Other cases
     else {
         if (the_idx_name.value == 'PRIMARY') {
-            document.forms['index_frm'].elements['index'].value = '';
+            document.forms['index_frm'].elements['index[Key_name]'].value = '';
         }
         if (typeof(the_idx_name.disabled) != 'undefined') {
-            document.forms['index_frm'].elements['index'].disabled = false;
+            document.forms['index_frm'].elements['index[Key_name]'].disabled = false;
         }
     }
 
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 5e5c533da4..e78b653081 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -48,4 +48,11 @@ if ($GLOBALS['text_dir'] == 'ltr') {
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
+<?php
+    if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) {
+?>
+    <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" />
+<?php
+    }
+?>
     <meta name="robots" content="noindex,nofollow" />
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 995ee2431f..7e9bec60f2 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -140,8 +140,8 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
 ?>
 
 <form action="./tbl_indexes.php" method="post" name="index_frm" id="index_frm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>
-    onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') {
-        this.elements['index'].disabled = false}">
+    onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') {
+        this.elements['index[Key_name]'].disabled = false}">
 <?php
 $form_params = array(
     'db'    => $db,
@@ -168,7 +168,9 @@ if (isset($_REQUEST['create_index'])) {
 }
 ?>
     </legend>
-
+<?php
+PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display();
+?>
 <div class="formelement">
 <label for="input_index_name"><?php echo __('Index name:'); ?></label>
 <input type="text" name="index[Key_name]" id="input_index_name" size="25"
@@ -183,11 +185,7 @@ if (isset($_REQUEST['create_index'])) {
 <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?>
 </div>
 
-
-<br class="clearfloat" />
-<?php
-PMA_Message::error(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display();
-?>
+<br class="clearfloat" /><br />
 
 <table id="index_columns">
 <thead>
diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css
new file mode 100644
index 0000000000..4aee6fbb1e
--- /dev/null
+++ b/themes/original/jquery/jquery-ui-1.8.override.css
@@ -0,0 +1,7 @@
+/**
+ * Use this file to override styles set by jquery-ui-1.8.custom.css
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1em; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
new file mode 100644
index 0000000000..4aee6fbb1e
--- /dev/null
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
@@ -0,0 +1,7 @@
+/**
+ * Use this file to override styles set by jquery-ui-1.8.custom.css
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1em; }