Add new icons and re-org to 2.0 template