:Added dashboard icon
:Resolved conflict