Added icons for save/new in merge UI