Fixed bug with icon and language assigning