Changed icons and added Substance