support alt icons
resolved conflicts