row icon rework and scss wrapper refactoring