layout
cleanup
merge conflict resolved
new icons