Fixed bug, added field group icons