icons bundled, easy select of toolbar id, some fixes