Add icons and refactor xmls