diff --git a/forms/gridfield/GridFieldDeleteAction.php b/forms/gridfield/GridFieldDeleteAction.php
index 62e32f007..488c57d25 100644
--- a/forms/gridfield/GridFieldDeleteAction.php
+++ b/forms/gridfield/GridFieldDeleteAction.php
@@ -109,7 +109,8 @@ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_Actio
 			$field = GridField_FormAction::create($gridField,  'DeleteRecord'.$record->ID, false, "deleterecord", array('RecordID' => $record->ID))
 				->addExtraClass('gridfield-button-delete')
 				->setAttribute('title', _t('GridAction.Delete', "Delete"))
-				->setAttribute('data-icon', 'decline');
+				->setAttribute('data-icon', 'cross-circle')
+				->setDescription('Delete');
 		}
 		return $field->Field();
 	}
diff --git a/templates/Includes/GridFieldEditButton.ss b/templates/Includes/GridFieldEditButton.ss
index 6db6c52a1..bfcc265b0 100644
--- a/templates/Includes/GridFieldEditButton.ss
+++ b/templates/Includes/GridFieldEditButton.ss
@@ -1 +1 @@
-<a class="action action-detail edit-link" href="$Link">edit</a>
\ No newline at end of file
+<a class="action action-detail edit-link" href="$Link" title="Edit">edit</a>
\ No newline at end of file