Merge branch 'release/v2.3.1'
Merge tag 'v2.3.1' into develop

added icon nav