deleted by mistake
t1239 button margin inconsistency fix
reduced amount of margin on last commit
Merge remote-tracking branch 'upstream/develop' into develop

button spacing inconsistency fix