Use new icons
Use new tiles