EZP-22152: Reorganized toolbar