Refactor icons on panel in header
Merge branch 'refactor' into develop