Added icon management for plugins
small refactoring
Revert "small refactoring"

This reverts commit 4924367406fb7419820fb665980510872438f72e.
small refactoring