Font Swatches fix (DT-1252)