diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 656f06226..97fe7d5e8 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -90,7 +90,17 @@ class DbBackendForm extends BaseBackendForm
             )
         );
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Backend');
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'type'      => 'submit',
+                'value'     => '1',
+                'escape'    => false,
+                'class'     => 'btn btn-cta btn-wide',
+                'label'     => '<i class="icinga-icon-save"></i> Save Backend'
+            )
+        );
     }
 
     /**
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 32d403491..5f578461c 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -129,7 +129,17 @@ class LdapBackendForm extends BaseBackendForm
             )
         );
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Backend');
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'type'      => 'submit',
+                'value'     => '1',
+                'escape'    => false,
+                'class'     => 'btn btn-cta btn-wide',
+                'label'     => '<i class="icinga-icon-save"></i> Save Backend'
+            )
+        );
     }
 
     /**
diff --git a/application/forms/Config/Authentication/ReorderForm.php b/application/forms/Config/Authentication/ReorderForm.php
index 7c5f2ffb4..6a0ea1f58 100644
--- a/application/forms/Config/Authentication/ReorderForm.php
+++ b/application/forms/Config/Authentication/ReorderForm.php
@@ -108,12 +108,15 @@ class ReorderForm extends Form
                 )
             );
             $this->upForm->addElement(
-                'submit',
+                'button',
                 'btn_' . $this->getBackendName() . '_reorder_up',
                 array(
+                    'type'      => 'submit',
+                    'escape'    => false,
+                    'class'     => 'btn btn-cta btn-wide',
+                    'value'     => 'btn_' . $this->getBackendName() . '_reorder_up',
                     'name'      =>  'btn_' . $this->getBackendName() . '_reorder_up',
-                    'label'     =>  '{{ICON_UP}} Move up in authentication order',
-
+                    'label'     =>  '<i class="icinga-icon-up"></i> Move up in authentication order',
                 )
             );
         }
@@ -128,11 +131,15 @@ class ReorderForm extends Form
                 )
             );
             $this->downForm->addElement(
-                'submit',
+                'button',
                 'btn_' . $this->getBackendName() . '_reorder_down',
                 array(
+                    'type'      => 'submit',
+                    'escape'    => false,
+                    'class'     => 'btn btn-cta btn-wide',
+                    'value'     => 'btn_' . $this->getBackendName() . '_reorder_down',
                     'name'      =>  'btn_' . $this->getBackendName() . '_reorder_down',
-                    'label'     =>  '{{ICON_UP}} Move down in authentication order',
+                    'label'     =>  '<i class="icinga-icon-down"></i> Move down in authentication order',
 
                 )
             );
diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/Config/ConfirmRemovalForm.php
index 9ea1794d6..722dbfc47 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@@ -77,6 +77,17 @@ class ConfirmRemovalForm extends Form
                 'required'  => true
             )
         );
-        $this->setSubmitLabel('{{REMOVE_ICON}} Confirm Removal');
+
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'type'      => 'submit',
+                'escape'    => false,
+                'value'     => '1',
+                'class'     => 'btn btn-cta btn-common',
+                'label'     => '<i class="icinga-icon-remove"></i> Confirm Removal'
+            )
+        );
     }
 }
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index e634c9efc..e997a2891 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -348,7 +348,17 @@ class GeneralForm extends Form
         $this->addDateFormatSettings($global);
         $this->addUserPreferencesDialog($preferences);
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'type'      => 'submit',
+                'escape'    => false,
+                'value'     => '1',
+                'class'     => 'btn btn-cta btn-common',
+                'label'     => '<i class="icinga-icon-save"></i> Save Changes'
+            )
+        );
     }
 
     /**
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
index b9e298a7f..9c227b2ae 100644
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@@ -168,7 +168,17 @@ class LoggingForm extends Form
 
         $this->enableAutoSubmit(array('logging_debug_enable'));
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'type'      => 'submit',
+                'escape'    => false,
+                'value'     => '1',
+                'class'     => 'btn btn-cta btn-common',
+                'label'     => '<i class="icinga-icon-save"></i> Save Changes'
+            )
+        );
     }
 
     /**
diff --git a/application/views/scripts/config/authentication.phtml b/application/views/scripts/config/authentication.phtml
index 9dd267da5..4bb8d947d 100644
--- a/application/views/scripts/config/authentication.phtml
+++ b/application/views/scripts/config/authentication.phtml
@@ -2,14 +2,13 @@
 use Icinga\Web\Url;
 $createLdapBackend = $this->href('/config/createAuthenticationBackend', array('type' => 'ldap'));
 $createDbBackend = $this->href('/config/createAuthenticationBackend', array('type' => 'db'));
-
 ?>
 
 <?= $this->tabs->render($this); ?>
 
 <?php if ($this->errorMessage): ?>
 <div class="alert alert-danger">
-  <i>{{ERROR_ICON}}</i>
+  <i class="icinga-icon-error"></i>
   <strong><?= $this->escape($this->errorMessage); ?></strong>
 </div>
 <?php endif; ?>
@@ -17,7 +16,7 @@ $createDbBackend = $this->href('/config/createAuthenticationBackend', array('typ
 
 <?php if ($this->successMessage): ?>
 <div class="alert alert-success">
-  <i>{{OK_ICON}}</i>
+  <i class="icinga-icon-success"></i>
   <strong><?= $this->escape($this->successMessage); ?></strong>
 </div>
 <?php endif; ?>
@@ -27,10 +26,9 @@ $createDbBackend = $this->href('/config/createAuthenticationBackend', array('typ
     Create Authentication Provider
   </div>
   <div class="panel-body">
-    <a href="<?= $createLdapBackend ?>">{{CREATE_ICON}} Create A New LDAP Authentication Backend</a><br/>
-    <a href="<?= $createDbBackend ?>">{{CREATE_ICON}} Create A New DB Authentication Backend</a>
+    <a href="<?= $createLdapBackend ?>"><i class="icinga-icon-create"></i> Create A New LDAP Authentication Backend</a><br/>
+    <a href="<?= $createDbBackend ?>"><i class="icinga-icon-create"></i> Create A New DB Authentication Backend</a>
   </div>
-
 </div>
 
 <?php foreach ($this->backends as $backend): ?>
@@ -42,12 +40,12 @@ $createDbBackend = $this->href('/config/createAuthenticationBackend', array('typ
   </div>
   <div class="panel-body">
     <a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backend->name));?>">
-      {{EDIT_ICON}} Edit This Authentication Provider
+        <i class="icinga-icon-edit"></i> Edit This Authentication Provider
     </a>
     <br/>
     <?php if (count($this->backends) > 1): ?>
     <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backend->name));?>">
-      {{REMOVE_ICON}} Remove This Authentication Provider
+        <i class="icinga-icon-remove"></i> Remove This Authentication Provider
     </a>
     <br/>
     <?php endif; ?>
diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/authentication/create.phtml
index 5aa84abbf..4980295c6 100644
--- a/application/views/scripts/config/authentication/create.phtml
+++ b/application/views/scripts/config/authentication/create.phtml
@@ -1,6 +1,9 @@
 <?= $this->tabs->render($this); ?>
 
-<h4>{{CREATE_ICON}} Create New Authentication Backend</h4>
+<h4>
+    <i class="icinga-icon-create"></i>
+    Create New Authentication Backend
+</h4>
 
 <?php if ($this->errorMessage): ?>
 <div class="alert alert-danger">
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml
index 7c8f6c7cf..273b8dcef 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -1,6 +1,9 @@
 <?= $this->tabs->render($this); ?>
 
-<h4>{{CREATE_ICON}} Edit Backend "<?= $this->escape($this->name); ?>"</h4>
+<h4>
+    <i class="icinga-icon-edit"></i>
+    Edit Backend "<?= $this->escape($this->name); ?>"
+</h4>
 
 <?php if ($this->errorMessage || $this->form->getErrorMessages()): ?>
 <div class="alert alert-danger">
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index 3a3cc27ce..703038314 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -1,4 +1,7 @@
 <?= $this->tabs->render($this); ?>
 
-<h4>{{REMOVE_ICON}} Remove Backend "<?= $this->escape($this->name); ?>"</h4>
+<h4>
+    <i class="icinga-icon-remove"></i>
+    Remove Backend "<?= $this->escape($this->name); ?>"
+</h4>
 <?= $this->form ?>
\ No newline at end of file
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index 603a496aa..98e227f7d 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -2,7 +2,7 @@
 
 <?php if ($this->successMessage): ?>
 <div class="alert alert-success">
-  <i>{{OK_ICON}}</i>
+  <i class="icinga-icon-success"></i>
   <strong><?= $this->escape($this->successMessage); ?></strong>
 </div>
 <?php endif; ?>
diff --git a/application/views/scripts/config/logging.phtml b/application/views/scripts/config/logging.phtml
index 98766d479..6b0b7cca3 100644
--- a/application/views/scripts/config/logging.phtml
+++ b/application/views/scripts/config/logging.phtml
@@ -4,7 +4,7 @@
 
 <?php if ($this->successMessage): ?>
 <div class="alert alert-success">
-  <i>{{OK_ICON}}</i>
+  <i class="icinga-icon-success"></i>
   <strong><?= $this->escape($this->successMessage); ?></strong>
 </div>
 <?php endif; ?>
diff --git a/application/views/scripts/config/module/overview.phtml b/application/views/scripts/config/module/overview.phtml
index 9eaa5357a..e7330c9c3 100644
--- a/application/views/scripts/config/module/overview.phtml
+++ b/application/views/scripts/config/module/overview.phtml
@@ -11,7 +11,7 @@ $modules = $this->modules->paginate();
 
 <?php if ($this->successMessage): ?>
 <div class="alert alert-success">
-  <i>{{OK_ICON}}</i>
+  <i class="icinga-icon-success"></i>
   <strong><?= $this->escape($this->successMessage); ?></strong>
 </div>
 <?php endif; ?>
@@ -30,10 +30,10 @@ $modules = $this->modules->paginate();
     <tr>
       <td>
       <? if ($module->enabled): ?>
-        <i>{{OK_ICON}}</i>
+        <i class="icinga-icon-success"></i>
         <a href="<?= $disableUrl ?>" data-icinga-target="main"><?= $this->escape($module->name); ?></a>
       <? else: ?>
-        <i>{{REMOVE_ICON}}</i>
+        <i class="icinga-icon-remove"></i>
         <a href="<?= $enableUrl ?>" data-icinga-target="main"><?= $this->escape($module->name); ?></a>
       <? endif ?>
       (<?=
diff --git a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
index fa048aa0a..776d8b717 100644
--- a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
+++ b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
@@ -76,6 +76,17 @@ class ConfirmRemovalForm extends Form
                 'required'  => true
             )
         );
-        $this->setSubmitLabel('{{REMOVE_ICON}} Confirm Removal');
+
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'type'      => 'submit',
+                'escape'    => false,
+                'value'     => '1',
+                'class'     => 'btn btn-cta btn-common',
+                'label'     => '<i class="icinga-icon-remove"></i> Confirm Removal'
+            )
+        );
     }
 }