Fixed custom buttons