[#41365365] Adding extra classes for css optimization.