Replace mask-image with Compound icons and component (when they became ready)

Replace mask-image with Compound icons and component (when they became ready) #4689