case 4338 - Buttons colors.
Merge branch 'case-4338' into develop