fix icon font
merge