EST-227: more icons
EST-281: more refactoring and tests