Fix bug - refs BT#8463

Icons added. Ready for merge