Merge "Move file type icons to new assets/ directory"