icon improvements
refactoring
inpromenets