PIM-1730 Fix icon display next to metric fields