Made new icon for datafiles, changed drain icon
fixed merge conflict