reorganized icons; refactored common decorated widget little bit