Resolve merge conflict
Rename color variable $icon-font-color
into  $contrast-icon-font-color