diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index ff2580c1b4..fdefed12d4 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -183,7 +183,6 @@ public function removeDashletAction()
             }
             return true;
         });
-        $form->setTitle($this->translate('Remove Dashlet From Dashboard'));
         $form->setRedirectUrl('dashboard/settings');
         $form->handleRequest();
         $this->view->pane = $pane;
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index d18397cf49..c08cf33e42 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -149,7 +149,7 @@ public function showAction()
                 'class'         => 'link-button spinner',
                 'value'         => 'btn_submit',
                 'decorators'    => array('ViewHelper'),
-                'label'         => $this->view->icon('trash'),
+                'label'         => $this->view->icon('cancel'),
                 'title'         => $this->translate('Remove this member')
             ));
             $this->view->removeForm = $removeForm;
diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php
index 305ae90421..4f07daa22d 100644
--- a/application/controllers/NavigationController.php
+++ b/application/controllers/NavigationController.php
@@ -189,7 +189,7 @@ public function sharedAction()
             'class'         => 'link-button spinner',
             'value'         => 'btn_submit',
             'decorators'    => array('ViewHelper'),
-            'label'         => $this->view->icon('trash'),
+            'label'         => $this->view->icon('cancel'),
             'title'         => $this->translate('Unshare this navigation item')
         ));
 
diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php
index ac3412a6e1..8815504521 100644
--- a/application/controllers/RoleController.php
+++ b/application/controllers/RoleController.php
@@ -120,7 +120,7 @@ public function removeAction()
         $role = new RoleForm();
         $role->setRedirectUrl('__CLOSE__');
         $role->setRepository(new RolesConfig());
-        $role->setSubmitLabel($this->translate('Remove Role'));
+        $role->setSubmitLabel($this->translate('Confirm Removal'));
         $role->remove($name);
 
         try {
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index dac80d34ec..925d6f73db 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -161,7 +161,7 @@ public function showAction()
                 'class'         => 'link-button spinner',
                 'value'         => 'btn_submit',
                 'decorators'    => array('ViewHelper'),
-                'label'         => $this->view->icon('trash'),
+                'label'         => $this->view->icon('cancel'),
                 'title'         => $this->translate('Cancel this membership')
             ));
             $this->view->removeForm = $removeForm;
diff --git a/application/forms/Announcement/AnnouncementForm.php b/application/forms/Announcement/AnnouncementForm.php
index 4da47e2f12..ef90eae242 100644
--- a/application/forms/Announcement/AnnouncementForm.php
+++ b/application/forms/Announcement/AnnouncementForm.php
@@ -91,7 +91,7 @@ protected function createUpdateElements(array $formData)
     protected function createDeleteElements(array $formData)
     {
         $this->setTitle(sprintf($this->translate('Remove announcement %s?'), $this->getIdentifier()));
-        $this->setSubmitLabel($this->translate('Yes'));
+        $this->setSubmitLabel($this->translate('Confirm Removal'));
         $this->setAttrib('class', 'icinga-controls');
     }
 
diff --git a/application/forms/Config/User/UserForm.php b/application/forms/Config/User/UserForm.php
index fb2ef4dc36..769b4cb057 100644
--- a/application/forms/Config/User/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -117,7 +117,7 @@ public function getValues($suppressArrayNotation = false)
     protected function createDeleteElements(array $formData)
     {
         $this->setTitle(sprintf($this->translate('Remove user %s?'), $this->getIdentifier()));
-        $this->setSubmitLabel($this->translate('Yes'));
+        $this->setSubmitLabel($this->translate('Confirm Removal'));
         $this->setAttrib('class', 'icinga-controls');
     }
 
diff --git a/application/forms/Config/UserGroup/UserGroupForm.php b/application/forms/Config/UserGroup/UserGroupForm.php
index b944e97285..04aa0fe2af 100644
--- a/application/forms/Config/UserGroup/UserGroupForm.php
+++ b/application/forms/Config/UserGroup/UserGroupForm.php
@@ -65,7 +65,7 @@ protected function createDeleteElements(array $formData)
             'Note that all users that are currently a member of this group will'
             . ' have their membership cleared automatically.'
         ));
-        $this->setSubmitLabel($this->translate('Yes'));
+        $this->setSubmitLabel($this->translate('Confirm Removal'));
         $this->setAttrib('class', 'icinga-form icinga-controls');
     }
 
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 52d4f14e2a..458bce6e65 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -38,7 +38,8 @@
                             'dashboard/remove-pane',
                             array('pane' => $pane->getName()),
                             array(
-                                'icon'  => 'trash',
+                                'icon'  => 'cancel',
+                                'class' => 'action-link',
                                 'title' => sprintf($this->translate('Remove pane %s'), $pane->getName())
                             )
                         ); ?>
@@ -77,7 +78,8 @@
                                     'dashboard/remove-dashlet',
                                     array('pane' => $pane->getName(), 'dashlet' => $dashlet->getName()),
                                     array(
-                                        'icon'  => 'trash',
+                                        'icon'  => 'cancel',
+                                        'class' => 'action-link',
                                         'title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getTitle())
                                     )
                                 ); ?>