icons are under css directory now
merge