Fixed button label changes
Fix for custom buttons