Moved reference for icon to /plugin/p4/
Merge remote-tracking branch 'upstream/master'
Icon path update.