#19, more changes for iOS buttons.