icon + menu cleanup