Bug fixes related to enable state in icon buttons