save window names and fix icons