improve icons and add merge svg