#11 Refresh icons
Merged 'develop'.