Added icon replacement