Merge branch 'hide_icons'