Integrate the PWP properly (fixes icons)