icons update and minor refactoring
Resolved part of #96 issue