Improve conflict icon