Merge branch 'feat/new-icons' into 'master'