Merge pull request #712 from jnarron/havoc

Changed shortcut icon type, and fixed shared and favorited status indicator