Fixes for handling of custom images for next button.