Fix button label on OS X
Fix issues with error icon