VID-1939 style adjustments