Comment 2 for bug 1365167

I disagree that "cancel should leave the image in the view". There's no point in adding an image that you aren't going to use straight away. The "Custom" list is more like "Recently Used" ... Hmmm, perhaps that would be a better label for it. And "Add an image..." would be better as "Other...", or maybe "Choose Another...".

Meanwhile, both issue 2 and bug 1365577 could be fixed by removing the menu altogether.