fixes issue with open-image-tool-button + solves conflicts