Index: plugins/acl/acl.js
===================================================================
--- plugins/acl/acl.js	(revision 48e9c14ebded89d858c8be0333f77f77a81b0877)
+++ plugins/acl/acl.js	(revision d9012055cbc94e478c41c975c2d22843d847b065)
@@ -29,4 +29,7 @@
         rcmail.enable_command('acl-create', 'acl-save', 'acl-cancel', 'acl-mode-switch', true);
         rcmail.enable_command('acl-delete', 'acl-edit', false);
+
+        if (rcmail.env.acl_advanced)
+            $('#acl-switch').addClass('selected');
     });
 }
@@ -130,4 +133,6 @@
 rcube_webmail.prototype.acl_list_init = function()
 {
+    $('#acl-switch')[this.env.acl_advanced ? 'addClass' : 'removeClass']('selected');
+
     this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
         {multiselect:true, draggable:false, keyboard:true, toggleselect:true});
Index: plugins/acl/package.xml
===================================================================
--- plugins/acl/package.xml	(revision b866a27364a66c436156732553b1fa638e046b8b)
+++ plugins/acl/package.xml	(revision d9012055cbc94e478c41c975c2d22843d847b065)
@@ -16,5 +16,5 @@
 	<date>2012-06-28</date>
 	<version>
-		<release>0.9</release>
+		<release>1.0</release>
 		<api>0.7</api>
 	</version>
Index: plugins/acl/skins/default/templates/table.html
===================================================================
--- plugins/acl/skins/default/templates/table.html	(revision 48e9c14ebded89d858c8be0333f77f77a81b0877)
+++ plugins/acl/skins/default/templates/table.html	(revision d9012055cbc94e478c41c975c2d22843d847b065)
@@ -12,18 +12,14 @@
     <roundcube:button command="acl-create" id="aclcreatelink" type="link" title="acl.newuser" class="buttonPas addgroup" classAct="button addgroup" content=" " />
     <roundcube:button name="aclmenulink" id="aclmenulink" type="link" title="acl.actions" class="button groupactions" onclick="show_aclmenu(); return false" content=" " />
-    <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
-    <div id="acladvswitch" class="pagenav">
-        <span><label for="acl-switch"><roundcube:label name="acl.advanced" /></label>
-        <input type="checkbox" id="acl-switch" onclick="rcmail.command('acl-mode-switch')"<roundcube:exp expression="config:acl_advanced_mode == true ? ' checked=checked' : ''" /> />
-        </span>
-    </div>
-    <roundcube:endif />
 </div>
 </div>
 
-<div id="aclmenu" class="popupmenu">
+<div id="aclmenu" class="popupmenu selectable">
     <ul>
         <li><roundcube:button command="acl-edit" label="edit" classAct="active" /></li>
         <li><roundcube:button command="acl-delete" label="delete" classAct="active" /></li>
+        <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
+            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch')" class="active" /></li>
+        <roundcube:endif />
     </ul>
 </div>
Index: plugins/acl/skins/larry/acl.css
===================================================================
--- plugins/acl/skins/larry/acl.css	(revision 4abcbd495d02c80c17976ced96c313976849cc7e)
+++ plugins/acl/skins/larry/acl.css	(revision d9012055cbc94e478c41c975c2d22843d847b065)
@@ -80,9 +80,9 @@
 #acltable tbody tr.selected td.partial
 {
-  background-color: #019bc6;                                                                                                                                             
-  background-image: url(images/partial.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);                                                                                                 
-  background-image: url(images/partial.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));                                                   
-  background-image: url(images/partial.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);                                                                                                   
-  background-image: url(images/partial.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);                                                                                                  
+  background-color: #019bc6;
+  background-image: url(images/partial.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/partial.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
+  background-image: url(images/partial.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/partial.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
   background-image: url(images/partial.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
 }
@@ -90,9 +90,9 @@
 #acltable tbody tr.selected td.enabled
 {
-  background-color: #019bc6;                                                                                                                                             
-  background-image: url(images/enabled.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);                                                                                                 
-  background-image: url(images/enabled.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));                                                   
-  background-image: url(images/enabled.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);                                                                                                   
-  background-image: url(images/enabled.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);                                                                                                  
+  background-color: #019bc6;
+  background-image: url(images/enabled.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/enabled.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
+  background-image: url(images/enabled.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/enabled.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
   background-image: url(images/enabled.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
 }
Index: plugins/acl/skins/larry/templates/table.html
===================================================================
--- plugins/acl/skins/larry/templates/table.html	(revision 48e9c14ebded89d858c8be0333f77f77a81b0877)
+++ plugins/acl/skins/larry/templates/table.html	(revision d9012055cbc94e478c41c975c2d22843d847b065)
@@ -5,17 +5,14 @@
 <div id="acllist-footer" class="boxfooter">
     <roundcube:button command="acl-create" id="aclcreatelink" type="link" title="acl.newuser" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="aclmenulink" id="aclmenulink" type="link" title="acl.actions" class="listbutton groupactions"onclick="UI.show_popup('aclmenu');return false" innerClass="inner" content="&#9881;" />
-    <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
-        <span class="countdisplay" style="display: inline">
-        <label for="acl-switch"><roundcube:label name="acl.advanced" /></label>
-        <input type="checkbox" id="acl-switch" onclick="rcmail.command('acl-mode-switch')"<roundcube:exp expression="config:acl_advanced_mode == true ? ' checked=checked' : ''" /> />
-        </span>
-    <roundcube:endif />
 </div>
 </div>
 
 <div id="aclmenu" class="popupmenu">
-    <ul class="toolbarmenu">
+    <ul class="toolbarmenu selectable">
         <li><roundcube:button command="acl-edit" label="edit" classAct="active" /></li>
         <li><roundcube:button command="acl-delete" label="delete" classAct="active" /></li>
+        <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
+            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch')" class="active" /></li>
+        <roundcube:endif />
     </ul>
 </div>