Backported CSS fixes to SCSS file

Backported CSS fixes to SCSS file