Merge branch 'brand-new-icons'

Conflicts:
	whitefox/browser/browser.css