Improved logic for greyscale icons