Merge pull request #2276 from Oldiesmann/release-2.1

! Warning status icons are part of the generic_icons sprite now (fixes #...