diff --git a/admin/images/sprites-32x32-sa4e142f7f0.png b/admin/images/sprites-32x32-sa4e142f7f0.png
new file mode 100644
index 000000000..c4e8604f9
Binary files /dev/null and b/admin/images/sprites-32x32-sa4e142f7f0.png differ
diff --git a/admin/javascript/LeftAndMain.EditForm.js b/admin/javascript/LeftAndMain.EditForm.js
index 3e17b2683..65577fa64 100644
--- a/admin/javascript/LeftAndMain.EditForm.js
+++ b/admin/javascript/LeftAndMain.EditForm.js
@@ -183,13 +183,6 @@
 			}
 		});
 
-		$('.cms-edit-form .ss-gridfield .action-edit').entwine({
-			onclick: function(e) {
-				$('.cms-container').loadPanel(this.attr('href'), '', {selector: '.cms-edit-form'});
-				e.preventDefault();
-			}
-		});
-		
 	});
 
 }(jQuery));
\ No newline at end of file
diff --git a/forms/gridfield/GridFieldPopupForms.php b/forms/gridfield/GridFieldPopupForms.php
index 168cc97f2..10eaaf0fd 100755
--- a/forms/gridfield/GridFieldPopupForms.php
+++ b/forms/gridfield/GridFieldPopupForms.php
@@ -214,12 +214,12 @@ class GridFieldPopupForm_ItemRequest extends RequestHandler {
 			// WARNING: The arguments passed here are a little arbitrary.  This API will need cleanup
 			$this->record->getCMSFields($this->popupController, $this->popupFormName),
 			new FieldList(
-				$saveAction = new FormAction('doSave', _t('GridFieldDetailsForm.Save', 'Save')),
-				$deleteAction = new FormAction('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete'))
+				FormAction::create('doSave', _t('GridFieldDetailsForm.Save', 'Save'))
+					->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'),
+				FormAction::create('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete'))
+					->setUseButtonTag(true)->addExtraClass('ss-ui-action-destructive')
 			)
 		);
-		$saveAction->addExtraClass('ss-ui-action-constructive');
-		$deleteAction->addExtraClass('ss-ui-action-destructive');
 		$form->loadDataFrom($this->record);
 		return $form;
 	}
diff --git a/templates/Includes/GridFieldAction_Edit.ss b/templates/Includes/GridFieldAction_Edit.ss
index 0c9d6b18a..a3fd612ae 100644
--- a/templates/Includes/GridFieldAction_Edit.ss
+++ b/templates/Includes/GridFieldAction_Edit.ss
@@ -1 +1 @@
-<a class="edit-link" href="$Link">edit</a> 
\ No newline at end of file
+<a class="action edit-link" href="$Link">edit</a> 
\ No newline at end of file