change allow-icon
Merge branch '1.1-stable'