Implement basic IconElement
Resolve merge conflict