Change buttons in labels dialog
Merge branch 'MH-723' into dev