add icon
conflict jade