#17548 fixes. Added common styles