Moved icon and data xml and removed vimlines