Merge branch 'hotfix/h1_u15_beorning_skill'
removed optional icon from base version (will be added in feature branch)
Merge branch 'hotfix/h2_icon_cleanup' into develop