Fixes to icons, fix UTF error in tests