modify views
merge conflict resolved
new icons