Corecomponents module - font fix 2