icon changes and code edits