merge fixes
Fix color selection
App icon image and icon color picker UI
Removing icon-chooser component, moved code to editor settings view