Bug 915082 - Replace favorite icons
Merge pull request #12125 from PinZhang/bug915082_bookmark_icon

Bug 915082 - Replace favorite icons, r=timdream