Large refactoring of toolbar, icon and popup