Restore missing icon pop-ups on some usages