Small cleanup, added menu icons