Fix #436, fix #435
Fix
Merge branch 'master' into icons