Issue #2113911 by LewisNyman, longwave, nod_, rteijeiro: Modal style update.