Fixed issue: Removed dublicated icons and not needed, old methods
Merge pull request #556 from sergeyklay/master

Minor fixes