diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index bab0018ab..bb8b75759 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -465,7 +465,7 @@ class PMA_Index
                 $this_params['index'] = $index->getName();
                 $r .= '<td ' . $row_span . '>'
                    . '    <a href="tbl_indexes.php' . PMA_generate_common_url($this_params)
-                   . '">' . PMA_getIcon('b_edit.png', __('Edit')) . '</a>'
+                   . '">' . PMA_getOnlyIcon('b_edit.png', __('Edit')) . '</a>'
                    . '</td>' . "\n";
 
                 $this_params = $GLOBALS['url_params'];
@@ -487,7 +487,7 @@ class PMA_Index
                 }
                 $r .= ' href="sql.php' . PMA_generate_common_url($this_params)
                    . '" >'
-                   . PMA_getIcon('b_drop.png', __('Drop'))  . '</a>'
+                   . PMA_getOnlyIcon('b_drop.png', __('Drop'))  . '</a>'
                    . '</td>' . "\n";
             }
 
diff --git a/tbl_structure.php b/tbl_structure.php
index bcc3496c4..263d25ac5 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -604,20 +604,6 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_type) {
      */
     echo PMA_Index::getView($table, $db);
     ?>
-<br />
-<form action="./tbl_indexes.php" method="post"
-    onsubmit="return checkFormElementInRange(this, 'added_fields',
-        '<?php echo str_replace('\'', '\\\'', __('Column count has to be larger than zero.')); ?>',
-        1)">
-<fieldset>
-    <?php
-    echo PMA_generate_common_hidden_inputs($db, $table);
-    echo sprintf(__('Create an index on &nbsp;%s&nbsp;columns'),
-        '<input type="text" size="2" name="added_fields" value="1" />');
-    ?>
-    <input type="submit" name="create_index" value="<?php echo __('Go'); ?>" />
-</fieldset>
-</form>
 <br />
     <?php
 }