leaves View setting
delete icon
Merge branch 'feature/bird1204' into devlop