ICONS! And some header cleaning, which may be overwritten by marcos