Fixed bug with icon resetting to default after closing popover

When closing the icon chooser by clicking outside the popover, the icon would
get reset to the default icon instead of keeping the current icon.