Adding additional class 'has-icon'.
Still removing icon stuff
Conflicts:
	template.php
Merge remote-tracking branch 'origin/dev' into dev
Attempting to remove just the template.php icon stuff, the css is good.
Conflicts:
	template.php