Add icons
Fixed bug in labelling saving