Upgrade fontset + add additional icons