fix the bugs and change fonts for icons