Bug 816135 - [Settings] - Need assets for the wifi icons, r=kaze(cherry picked from commit 6d8ee303fbafa200c87546ac1470214dd2334697)

Conflicts:
	apps/settings/style/icons.css
Merge pull request #10127 from lissyx/bug877999

Bug 877999 - Check that network is not null, r=kaze(cherry picked from commit 6a0b2e542f3f4fd042798ab2bd0c21df523e94a4)