All icons now in one file