Merge pull request #1878 from Areloch/splashAndWindowIcons