Charms buttons fix