VID-1680 Actually remove the icons - for serious