update PopupWindow hack (remove IcsPopupWindow)