Added escaping, icon and colour