diff --git a/src/Forms/GridField/GridFieldDeleteAction.php b/src/Forms/GridField/GridFieldDeleteAction.php
index 51cfa6268..5f714c177 100644
--- a/src/Forms/GridField/GridFieldDeleteAction.php
+++ b/src/Forms/GridField/GridFieldDeleteAction.php
@@ -245,8 +245,8 @@ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_Actio
                 "deleterecord",
                 ['RecordID' => $record->ID]
             )
-                ->addExtraClass('gridfield-button-delete btn--icon-md font-icon-trash-bin btn--no-text grid-field__icon-action action-menu--handled')
-                ->setAttribute('classNames', 'gridfield-button-delete font-icon-trash')
+                ->addExtraClass('action--delete btn--icon-md font-icon-trash-bin btn--no-text grid-field__icon-action action-menu--handled')
+                ->setAttribute('classNames', 'action--delete font-icon-trash')
                 ->setDescription($title)
                 ->setAttribute('aria-label', $title);
         }
diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
index b5a4b5baa..5667ee371 100644
--- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
+++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
@@ -288,7 +288,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
             if ($canDelete) {
                 $actions->push(FormAction::create('doDelete', _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Delete', 'Delete'))
                     ->setUseButtonTag(true)
-                    ->addExtraClass('btn-outline-danger btn-hide-outline font-icon-trash-bin action-delete'));
+                    ->addExtraClass('btn-outline-danger btn-hide-outline font-icon-trash-bin action--delete'));
             }
         } else { // adding new record
             //Change the Save label to 'Create'
diff --git a/tests/php/Forms/GridField/GridFieldDeleteActionTest.php b/tests/php/Forms/GridField/GridFieldDeleteActionTest.php
index d9758ba37..0a3014759 100644
--- a/tests/php/Forms/GridField/GridFieldDeleteActionTest.php
+++ b/tests/php/Forms/GridField/GridFieldDeleteActionTest.php
@@ -85,7 +85,7 @@ class GridFieldDeleteActionTest extends SapphireTest
     {
         $this->logInWithPermission('ADMIN');
         $content = new CSSContentParser($this->gridField->FieldHolder());
-        $deleteButtons = $content->getBySelector('.gridfield-button-delete');
+        $deleteButtons = $content->getBySelector('.action--delete');
         $this->assertEquals(3, count($deleteButtons), 'Delete buttons should show when logged in.');
     }