diff --git a/modules/setup/application/views/scripts/form/setup-modules.phtml b/modules/setup/application/views/scripts/form/setup-modules.phtml
index 859acfaa2..108218441 100644
--- a/modules/setup/application/views/scripts/form/setup-modules.phtml
+++ b/modules/setup/application/views/scripts/form/setup-modules.phtml
@@ -24,9 +24,5 @@ use Icinga\Web\Wizard;
 <?php endforeach ?>
   <?= $form->getElement($form->getTokenElementName()); ?>
   <?= $form->getElement($form->getUidElementName()); ?>
-  <div class="buttons">
-    <?= $form->getElement(Wizard::BTN_PREV); ?>
-    <?= $form->getElement(Wizard::BTN_NEXT); ?>
-    <?= $form->getElement(Wizard::PROGRESS_ELEMENT); ?>
-  </div>
+  <?= $form->getDisplayGroup('buttons'); ?>
 </form>
diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index 3ddd5b404..4ded84deb 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -2,6 +2,10 @@
 
 use Icinga\Web\Wizard;
 
+if (! $form->getWizard()->getRequirements()->fulfilled()) {
+    $form->getElement(Wizard::BTN_NEXT)->setAttrib('disabled', 1);
+}
+
 ?>
 <h1>Icinga Web 2</h1>
 <?= $form->getWizard()->getRequirements(true); ?>
@@ -20,14 +24,12 @@ use Icinga\Web\Wizard;
   <?= $form->getElement($form->getTokenElementName()); ?>
   <?= $form->getElement($form->getUidElementName()); ?>
   <div class="buttons">
-    <?= $form->getElement(Wizard::BTN_PREV); ?>
     <?php
-      $btn = $form->getElement(Wizard::BTN_NEXT);
-      if (! $form->getWizard()->getRequirements()->fulfilled()) {
-          $btn->setAttrib('disabled', 1);
-      }
-      echo $btn;
+      $double = clone $form->getElement(Wizard::BTN_NEXT);
+      echo $double->setAttrib('class', 'double');
     ?>
+    <?= $form->getElement(Wizard::BTN_PREV); ?>
+    <?= $form->getElement(Wizard::BTN_NEXT); ?>
     <?= $form->getElement(Wizard::PROGRESS_ELEMENT); ?>
     <div class="requirements-refresh">
       <?php $title = $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>
diff --git a/modules/setup/application/views/scripts/form/setup-summary.phtml b/modules/setup/application/views/scripts/form/setup-summary.phtml
index 7c91ecd05..cdffb8c15 100644
--- a/modules/setup/application/views/scripts/form/setup-summary.phtml
+++ b/modules/setup/application/views/scripts/form/setup-summary.phtml
@@ -2,6 +2,8 @@
 
 use Icinga\Web\Wizard;
 
+$form->getElement(Wizard::BTN_NEXT)->setAttrib('class', 'finish');
+
 ?>
 <p><?= sprintf(
   $this->translate(
@@ -31,9 +33,5 @@ use Icinga\Web\Wizard;
 >
   <?= $form->getElement($form->getTokenElementName()); ?>
   <?= $form->getElement($form->getUidElementName()); ?>
-  <div class="buttons">
-    <?= $form->getElement(Wizard::BTN_PREV); ?>
-    <?= $form->getElement(Wizard::BTN_NEXT)->setAttrib('class', 'finish'); ?>
-    <?= $form->getElement(Wizard::PROGRESS_ELEMENT); ?>
-  </div>
+  <?= $form->getDisplayGroup('buttons'); ?>
 </form>
\ No newline at end of file