Follow new css
Merge pull request #1865 from zz9pzza/issue_4098

issue 4098: Follow new css