Bug 820212 implement copy changes and icon change based on feedback
Merge pull request #808 from ossreleasefeed/firefoxos-policy-additions-changes