Icon structure refactor