GGP-24: change icon choice popup