Reorganise images to better suit other platforms as well as icons