:Added new icons
:Resolved conflict