DAR-2857: New Customize toolbar modal changes

Needs CR