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>