General refactoring, non-img icons integrated.