Fix custom buttons