icomoons added
conflict resolved