Color some & and change some icons