fixes
Merge branch 'master' into documents
icon on button
fix document