icon changes
adjust
merge