Dronka icons
Refactoring
Merge branch 'master' into dronka_ex1