icons replaced, slight cross bugfix