diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 1a73f8735..e73529a40 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -181,7 +181,7 @@ class RoleForm extends RepositoryForm
                     [
                         'decorators'    => ['ViewHelper'],
                         'value'         => '<h3>' . ($moduleName !== 'application'
-                            ? sprintf($this->translate('Module: %s'), $moduleName)
+                            ? sprintf('%s <em>%s</em>', $moduleName, $this->translate('Module'))
                             :  'Icinga Web 2') . '</h3>'
                     ]
                 );
@@ -242,7 +242,7 @@ class RoleForm extends RepositoryForm
                         ['Fieldset', [
                             'class'                 => 'collapsible',
                             'data-toggle-element'   => 'h3',
-                            'data-visible-height'   => 64
+                            'data-visible-height'   => 32
                         ]]
                     ]
                 ]);
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index a4965e30f..8f0a202ca 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -23,6 +23,53 @@ form.icinga-form {
   max-width: 70em;
   width: 80%;
 
+  > fieldset {
+    border: none;
+    padding: 0;
+    margin: 0;
+
+    h3 em {
+      font-size: .857em;
+      font-weight: normal;
+      color: @text-color-light;
+    }
+
+    h4 {
+      margin-top: 1.5em;
+    }
+
+    &.collapsible:before {
+      display: none;
+    }
+
+    &:not(:last-of-type) .collapsible-control {
+      border-bottom: 1px solid @gray-light
+    }
+
+    .collapsed .collapsible-control {
+      border-bottom: none;
+    }
+
+    .collapsible-control:before {
+      content: "\f103";
+      display: inline-block;
+      font-family: 'ifont';
+      font-weight: normal;
+      padding: 0 .25em;
+      margin-right: .25em;
+      width: 1em;
+      opacity: .6;
+    }
+
+    &.collapsed .collapsible-control:before {
+      content: "\e87b";
+    }
+
+    .permission-heading {
+      display: none;
+    }
+  }
+
   .control-group {
     display: flex;
     flex-wrap: wrap;