Adding improved icon templates