diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 746fbb2b5..e566576d4 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -53,10 +53,10 @@ if (! empty($submit_mult)
         // coming from table structure view - do something with selected columns/fileds
         $selected     = $selected_fld;
         switch ($submit_mult) {
-            case __('Drop'):
+            case 'drop':
                 $what     = 'drop_fld';
                 break;
-            case __('Primary'):
+            case 'primary':
                 // Gets table primary key
                 PMA_DBI_select_db($db);
                 $result      = PMA_DBI_query('SHOW KEYS FROM ' . PMA_backquote($table) . ';');
@@ -78,25 +78,25 @@ if (! empty($submit_mult)
                     $what = 'primary_fld';
                 }
                 break;
-            case __('Index'):
+            case 'index':
                 unset($submit_mult);
                 $query_type = 'index_fld';
                 $mult_btn   = __('Yes');
                 break;
-            case __('Unique'):
+            case 'unique':
                 unset($submit_mult);
                 $query_type = 'unique_fld';
                 $mult_btn   = __('Yes');
                 break;
-            case __('Fulltext'):
+            case 'ftext':
                 unset($submit_mult);
                 $query_type = 'fulltext_fld';
                 $mult_btn   = __('Yes');
                 break;
-            case __('Change'):
+            case 'change':
                 require './tbl_alter.php';
                 break;
-            case __('Browse'):
+            case 'browse':
                 // this should already be handled by tbl_structure.php
         }
     } else {
diff --git a/tbl_structure.php b/tbl_structure.php
index cd5b9be6f..18eedeec2 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -554,19 +554,19 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
 <i><?php echo __('With selected:'); ?></i>
 
 <?php
-PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse'), 'b_browse.png');
+PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse'), 'b_browse.png', 'browse');
 
 if (! $tbl_is_view && ! $db_is_information_schema) {
-    PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png');
-    PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png');
+    PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png', 'change');
+    PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png', 'drop');
     if ('ARCHIVE' != $tbl_type) {
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png');
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png');
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png');
+        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png', 'primary');
+        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png', 'unique');
+        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png', 'index');
     }
 
     if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) {
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png');
+        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png', 'ftext');
     }
 }
 ?>