fix #8320 links to references as appended icon & custom icon font set
whitespace cleanup
moving method to includes/
refactoring: refactored functions moved into includes
refactoring: reducing amount of theme functions, functions moved into includes/