Fix some problmens with icon detection and add Cisco and F5 icons