x4d icon set
Fix bugs