Icon bugfix
Codeformatting
Merge branch 'feature/1102_icon_bug' into develop