Better icons and navigation behaviour