FIX DDBNEXT-673
Fix button classes
Merge branch 'PRERELEASEBUGFIX' into develop