Improved top-level icons support in Mustang