Reorganize icon/image paths