Swap button-order on modal dialogs

Issue #4583

- Delete button should be on the right, cancel on the left, for all modal dialogs.