new icons, minor cleanup