Refactor move icon and splitted xml file in data/views