diff --git a/html/themes/breezy/less/style.less b/html/themes/breezy/less/style.less
index 85aa32a7cfd63f7ceccc7205d8d6d54d068bdc44..754596e32d2d66623ea68c57dce383da9024c8ab 100644
--- a/html/themes/breezy/less/style.less
+++ b/html/themes/breezy/less/style.less
@@ -458,22 +458,34 @@ div.acledition {
   }
   > table {
     width:100%;
-    border:1px solid #A0A0A0;
+    border:1px solid @border-color-1;
     border-spacing:0;
     border-collapse:collapse;
+    margin-top:10px;
+    input[type=checkbox] {
+      vertical-align:middle;
+    }
     > tbody > tr:nth-child(1) > td {
-      background-color:#C8C8C8;
-      height:1.8em;
+      background-color:@background-dark-color;
+      border-bottom: 1px solid @border-color-1;
+    }
+    > tbody > tr:nth-child(1) > td:nth-child(1) {
+      padding-top: 5px;
+      padding-bottom: 5px;
+      html.ltr & {
+        padding-left: 5px;
+      }
+      html.rtl & {
+        padding-right: 5px;
+      }
     }
     &.expand > tbody > tr:nth-child(1) > td {
-      background-color:#C8C8FF;
+      background-color: @critical-section-legend-background-color;
     }
     > tbody > tr:nth-child(2) {
       > td:nth-child(1) {
-        background-color:#E0E0E0;
       }
       > td:nth-child(2) {
-        background-color:#D4D4D4;
       }
     }
     > tbody > tr:nth-child(3) {
@@ -486,7 +498,7 @@ div.acledition {
           border-collapse: collapse;
           border:1px solid;
           > tbody > tr > td {
-           border:1px solid #A0A0A0;
+           border:1px solid @border-color-1;
            width:33%;
           }
         }
diff --git a/html/themes/breezy/style.css b/html/themes/breezy/style.css
index e9b6aafdb01af45978ab49dabcc32f422b949047..968f3dc926cb355c2a32b779d6ccdb37edff4c3a 100644
--- a/html/themes/breezy/style.css
+++ b/html/themes/breezy/style.css
@@ -432,22 +432,30 @@ div.acledition div.setbuttons input {
 }
 div.acledition > table {
   width: 100%;
-  border: 1px solid #A0A0A0;
+  border: 1px solid #c0c2c3;
   border-spacing: 0;
   border-collapse: collapse;
+  margin-top: 10px;
+}
+div.acledition > table input[type=checkbox] {
+  vertical-align: middle;
 }
 div.acledition > table > tbody > tr:nth-child(1) > td {
-  background-color: #C8C8C8;
-  height: 1.8em;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #c0c2c3;
 }
-div.acledition > table.expand > tbody > tr:nth-child(1) > td {
-  background-color: #C8C8FF;
+div.acledition > table > tbody > tr:nth-child(1) > td:nth-child(1) {
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
-div.acledition > table > tbody > tr:nth-child(2) > td:nth-child(1) {
-  background-color: #E0E0E0;
+html.ltr div.acledition > table > tbody > tr:nth-child(1) > td:nth-child(1) {
+  padding-left: 5px;
 }
-div.acledition > table > tbody > tr:nth-child(2) > td:nth-child(2) {
-  background-color: #D4D4D4;
+html.rtl div.acledition > table > tbody > tr:nth-child(1) > td:nth-child(1) {
+  padding-right: 5px;
+}
+div.acledition > table.expand > tbody > tr:nth-child(1) > td {
+  background-color: #bbccff;
 }
 div.acledition > table > tbody > tr:nth-child(3) {
   vertical-align: top;
@@ -462,7 +470,7 @@ div.acledition > table > tbody > tr:nth-child(3) > td > div > table {
   border: 1px solid;
 }
 div.acledition > table > tbody > tr:nth-child(3) > td > div > table > tbody > tr > td {
-  border: 1px solid #A0A0A0;
+  border: 1px solid #c0c2c3;
   width: 33%;
 }
 /* On small screens */
diff --git a/plugins/admin/aclrole/acleditiondialog.tpl b/plugins/admin/aclrole/acleditiondialog.tpl
index d067993c2038a1e24358ecfd473c0e4dfb7fef27..e89ba7fea014d2d8797fb20db13c4d1338578829 100644
--- a/plugins/admin/aclrole/acleditiondialog.tpl
+++ b/plugins/admin/aclrole/acleditiondialog.tpl
@@ -132,7 +132,7 @@
             </td>
           </tr>
         </tbody>
-      </table><br/>
+      </table>
     {/foreach}
 
   </div>
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index d341b3ebd5454c3d02b693344f642126bd00166b..9dc188993ec930009e0c7561c39ac59c249dbdc3 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -290,6 +290,18 @@ class ACLEditionDialog implements FusionDirectoryDialog
           ],
         ];
       }
+      if (isset($aclObjects[$this->aclObject.'/template'])) {
+        /* Move template to the end */
+        $data = $aclObjects[$this->aclObject.'/template'];
+        unset($aclObjects[$this->aclObject.'/template']);
+        $aclObjects[$this->aclObject.'/template'] = $data;
+      }
+      if (isset($aclObjects[$this->aclObject.'/archivedObject'])) {
+        /* Move archivedObject to the end */
+        $data = $aclObjects[$this->aclObject.'/archivedObject'];
+        unset($aclObjects[$this->aclObject.'/archivedObject']);
+        $aclObjects[$this->aclObject.'/archivedObject'] = $data;
+      }
       $smarty->assign('headline', sprintf(_('Edit ACL for "%s"'), $config->data['CATEGORIES'][$this->aclObject]['description']));
       $smarty->assign('aclObjects', $aclObjects);
     }