Introduce new style and fix some more bugs
Small fix to icons