diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 1e91a467f..498838fb1 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -37,6 +37,8 @@ class RoleForm extends RepositoryForm
 
     public function init()
     {
+        $this->setAttrib('class', self::DEFAULT_CLASSES . ' role-form');
+
         $helper = new Zend_Form_Element('bogus');
         $view = $this->getView();
 
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 8f0a202ca..a1af4b635 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -50,7 +50,7 @@ form.icinga-form {
       border-bottom: none;
     }
 
-    .collapsible-control:before {
+    .collapsible-control:after {
       content: "\f103";
       display: inline-block;
       font-family: 'ifont';
@@ -59,10 +59,12 @@ form.icinga-form {
       margin-right: .25em;
       width: 1em;
       opacity: .6;
+      float: right;
     }
 
-    &.collapsed .collapsible-control:before {
-      content: "\e87b";
+    &.collapsed .collapsible-control:after {
+      /*content: "\e87b";*/
+      content: "\e87a";
     }
 
     .permission-heading {
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index de36831de..15f21939e 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -218,6 +218,17 @@ table.multiselect tr[href] td {
   }
 }
 
+form.role-form {
+  &.icinga-form .control-label-group {
+    width: 20em;
+  }
+
+  .control-label-group em {
+    color: @text-color-light;
+    font-style: normal;
+  }
+}
+
 ul.tree select:first-of-type { /* ?? */
   margin-bottom: 0.3em;
   margin-left: 2em;