diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index d6505c32a..74044ee74 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -313,6 +313,8 @@ class acl extends rcube_plugin
     {
         // Create username input
         $attrib['name'] = 'acluser';
+        $class = $attrib['class'];
+        unset($attrib['class']);
 
         $textfield = new html_inputfield($attrib);
 
@@ -340,11 +342,11 @@ class acl extends rcube_plugin
                     . $val);
             }
 
-            $out = html::tag('ul', array('id' => 'usertype', 'class' => $attrib['class']), $ul, html::$common_attrib);
+            $out = html::tag('ul', array('id' => 'usertype', 'class' => $class), $ul, html::$common_attrib);
         }
         // Display text input alone
         else {
-            $out = $fields['user'];
+            $out = html::div($class, $fields['user']);
         }
 
         return $out;
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index a04defa5f..d3a955c12 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -619,20 +619,25 @@ html.ms .propform {
 
 td.editfield { width: 99%;  /* TODO */ }
 
-
-ul.proplist {
+@proplist-record-height: 2rem;
+.proplist {
     margin-bottom: 0;
 
-    @media screen and (min-width: (@screen-width-bs-phone + 1px)) {
+    .formcontent > &,
+    fieldset > & {
         padding-left: 0;
     }
 
     li {
         list-style-type: none;
-        line-height: 2.4rem;
+        line-height: @proplist-record-height;
         margin-bottom: .25rem;
         display: flex;
 
+        &:last-child {
+            margin-bottom: 0;
+        }
+
         input[type=radio] {
             vertical-align: middle;
             margin-right: .5em;
@@ -644,16 +649,22 @@ ul.proplist {
 
         label {
             margin: 0;
+            line-height: @proplist-record-height;
         }
 
         .icon-checkbox {
-            height: 2.4rem !important;
+            height: @proplist-record-height;
             margin-left: -1.2em;
 
             & + label {
-                height: 2rem;
+                height: @proplist-record-height;
                 margin-right: .5rem;
-                padding: 0;
+                padding: 0 !important;
+                line-height: 1.25;
+
+                html.touch &:before {
+                    line-height: 1.1;
+                }
             }
         }
 
@@ -664,7 +675,6 @@ ul.proplist {
     }
 }
 
-
 .checklist {
     .form-check-input + label {
         margin-right: .25rem;
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index 61b56cf75..e8b5924bf 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -844,10 +844,6 @@ a.button.icon.toolbar-button {
     }
 
     ul.proplist {
-        li {
-            margin: 0;
-        }
-
         & + div {
             margin-top: 1rem;
         }