Fix Icon component
Add plus component
Make Plus component more extensible