new icons, restructure to match wireframe