Dronka icons
Refactoring