diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index ad1fb038f..38efdbb4f 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -13,9 +13,10 @@
                ng-click="acl.selectUser(user)"
                ng-class="{ 'sg-collapsed': user.uid != acl.selectedUser.uid, 'sg-expanded': user.uid == acl.selectedUser.uid }">
         <md-button>
-          <div layout="row" layout-align="start center">
+          <div layout="row" layout-align="start center" class="md-flex">
             <span class="card-picture" ng-switch="user.userClass">
               <div ng-switch-when="normal-user" class="sg-avatar"><!-- normal-user --></div>
+              <div ng-switch-when="normal-group" class="sg-list-avatar"><!-- normal-group --></div>
               <div ng-switch-when="public-user" class="sg-list-avatar"><!-- public-user --></div>
             </span>
             <div class="sg-tile-content">
diff --git a/UI/WebServerResources/scss/components/card/card.scss b/UI/WebServerResources/scss/components/card/card.scss
index b97baae93..e8b7b4a18 100644
--- a/UI/WebServerResources/scss/components/card/card.scss
+++ b/UI/WebServerResources/scss/components/card/card.scss
@@ -5,7 +5,6 @@ md-card {
   overflow: hidden;
 
   md-card-content {
-    order: 1;
     transition: $swift-ease-in-out;
   }
 
@@ -13,13 +12,31 @@ md-card {
     background-color: sg-color($sogoPaper, 50);
   }
 
+  // Collapsed/expanded states for cards in ACL editor
+  &.sg-collapsed, &.sg-expanded {
+    transition: $swift-ease-in-out;
+    transition-delay: 0s;
+    > .md-button {
+      margin: 0;
+      flex-direction: row;
+    }
+    md-card-content {
+      order: 1;
+      transition: $swift-ease-in-out;
+      transition-delay: 0.1s;
+      max-height: 500px;
+      &.ng-hide {
+        max-height: 0;
+        padding-bottom: 0;
+        padding-top: 0;
+      }
+    }
+  }
+
   &.sg-collapsed {
     border-radius: 0;
     margin-top: 0;
     margin-bottom: 0;
-    > .md-button {
-      margin: 0;
-    }
   }
 
   &.sg-expanded {