Popup user icon fixes