additional changes to popup
merge master and custom-icon-branch