update icons
Merge branch 'master' of https://github.com/nbieber/browser_companion
resolve conflicts