footer icon changes
icons conflict lösen

Conflicts:
	images/icons/i.png
	images/icons/x.png