Reset images to tool-standard
Some cleanup