diff --git a/db_operations.php b/db_operations.php
index 77c2af7632..512c894c9f 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -357,7 +357,12 @@ if (!$is_information_schema) {
     <?php echo PMA_generate_common_hidden_inputs($db); ?>
     <fieldset>
         <legend>
-        <?php echo PMA_getIcon('b_comment.png', __('Database comment: '), true); ?>
+        <?php
+        if ($cfg['PropertiesIconic']) {
+            echo '<img class="icon ic_b_comment" src="themes/dot.gif" alt="" />';
+        }
+        echo __('Database comment: ');
+        ?>
         </legend>
         <input type="text" name="comment" class="textfield" size="30"
             value="<?php
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 738d64b821..d1d051d7db 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -364,7 +364,8 @@ $(document).ready(function() {
         var button_options = {};
         button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
 
-        $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) {
+        var token = $(this).parents('form').find('input[name="token"]').val();
+        $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true, 'token': token}, function(data) {
             $('<div id="edit_user_dialog"></div>')
             .append(data)
             .dialog({
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index b200e45d53..848eb288f5 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -202,7 +202,7 @@ EOT;
 
         if ($in_fbs) {
             $edit_url = 'gis_data_editor.php?' . PMA_generate_common_url();
-            $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true);
+            $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'));
             $str .= '<span class="open_search_gis_editor">';
             $str .= PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank');
             $str .= '</span>';
diff --git a/tbl_change.php b/tbl_change.php
index 2fd9394605..7bc076747e 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -990,7 +990,7 @@ foreach ($rows as $row_id => $vrow) {
                 $_url_params = $_url_params + array('gis_data[gis_type]' => strtoupper($field['pma_type']));
             }
             $edit_url = 'gis_data_editor.php' . PMA_generate_common_url($_url_params);
-            $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true);
+            $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'));
             echo('<span class="open_gis_editor">');
             echo(PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank'));
             echo('</span>');