[#51152781] Aligned buttons, added icons and placed a blank "Cancel" button.
Merge remote-tracking branch 'origin/master'