New icons + Popup changes