Corecomponents module - resolve hard coded font issue