Merge pull request #722 from jnarron/havoc

Added icon to statuses with shared location
Merge remote-tracking branch 'upstream/havoc' into havoc