icons set and code cleanup