(WCM-274) Adjust buttons ordering in dialogs