diff --git a/application/forms/Dashboard/BaseDashboardForm.php b/application/forms/Dashboard/BaseDashboardForm.php
index 55b402143..f08fd1bdf 100644
--- a/application/forms/Dashboard/BaseDashboardForm.php
+++ b/application/forms/Dashboard/BaseDashboardForm.php
@@ -78,7 +78,7 @@ abstract class BaseDashboardForm extends CompatForm
     {
         return HtmlElement::create('button', [
             'type'                     => 'button',
-            'class'                    => 'modal-cancel',
+            'class'                    => 'btn-cancel',
             'data-icinga-modal-cancel' => true
         ])->setContent(t('Cancel'));
     }
@@ -94,7 +94,7 @@ abstract class BaseDashboardForm extends CompatForm
     protected function createRemoveButton(Url $action, string $label)
     {
         return $this->createElement('submitButton', 'btn_remove', [
-            'class'      => 'remove-button',
+            'class'      => 'btn-remove',
             'label'      => [new Icon('trash'), $label],
             'formaction' => (string) $action
         ]);
diff --git a/library/Icinga/Web/Dashboard/Setup/SetupNewDashboard.php b/library/Icinga/Web/Dashboard/Setup/SetupNewDashboard.php
index 8a81c13c4..2f33d4a0e 100644
--- a/library/Icinga/Web/Dashboard/Setup/SetupNewDashboard.php
+++ b/library/Icinga/Web/Dashboard/Setup/SetupNewDashboard.php
@@ -45,8 +45,6 @@ class SetupNewDashboard extends BaseDashboardForm
 
     protected function assemble()
     {
-        $this->getAttributes()->add('class', 'modal-form');
-
         if ($this->getPopulatedValue('btn_next')) { // Configure Dashlets
             $this->dumpArbitaryDashlets();
 
diff --git a/public/css/icinga/dashboards.less b/public/css/icinga/dashboards.less
index 3f83ea401..16b2cbcc3 100644
--- a/public/css/icinga/dashboards.less
+++ b/public/css/icinga/dashboards.less
@@ -291,36 +291,6 @@
   margin-left: 1.4em;
 }
 
-// Make the submit buttons a bit bigger than the normal size
-.modal-form.icinga-controls .control-group.form-controls input[type="submit"],
-.control-group.form-controls .modal-cancel {
-  min-width: 7em;
-  font-size: 1.2em;
-  padding: ~"calc(@{vertical-padding} - 2px)" @horizontal-padding;
-}
-
-// Remove and modal cancel buttons
-form.icinga-form .control-group.form-controls .remove-button {
-  .cancel-button();
-  margin-right: auto;
-}
-
-.modal-form .control-group.form-controls .modal-cancel {
-  padding: .5em 1em;
-}
-
-.control-group.form-controls .modal-cancel {
-  .button();
-  border: none;
-  color: @icinga-blue;
-  background-color: @low-sat-blue;
-
-  &:hover {
-    color: @text-color-on-icinga-blue;
-    background-color: @icinga-blue;
-  }
-}
-
 // Drag and drop
 .sortable-chosen {
   .box-shadow();