DDBNEXT-1874: general modal restyling
Merge branch 'DDBNEXT-1874' into develop