diff --git a/plugins/acl/skins/elastic/templates/table.html b/plugins/acl/skins/elastic/templates/table.html
index 17353329e..c8f492924 100644
--- a/plugins/acl/skins/elastic/templates/table.html
+++ b/plugins/acl/skins/elastic/templates/table.html
@@ -19,7 +19,7 @@
 		<roundcube:button command="acl-edit" label="edit" type="link-menuitem" class="edit" classAct="edit active" />
 		<roundcube:button command="acl-delete" label="delete" type="link-menuitem" class="delete" classAct="delete active" />
 		<roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
-			<li role="menuitem" class="checkbox"><label id="acl-switch"><input type="checkbox" onchange="rcmail.command('acl-mode-switch')" /><roundcube:label name="acl.advanced" /></label></li>
+			<li role="menuitem" class="checkbox"><label id="acl-switch"><input type="checkbox" onchange="rcmail.command('acl-mode-switch')" /><a class="active"><roundcube:label name="acl.advanced" /></a></label></li>
 		<roundcube:endif />
 	</ul>
 </div>
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index b5b125b4f..36b9c3d3a 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -437,6 +437,10 @@
                 font-size: 1.1rem;
             }
         }
+
+        a {
+            padding: 0 !important;
+        }
     }
 
     a {