ref #4111 - add glyphicons to system- messages
refactoring and bug-fixing