JUNIPER-ONLY: merge the code and fix Topology icons issue