Changed the icons
Fixed merge issues when merging icons
Icons fully merged