Update icons
changing symbol to icons font
replacing icons with proper ones
resolving conflicts