Added basic support for images on buttons