Icons as window titles
Fixed merge conflict in index.html