Merge "Fixed that the icon could dissappear" into oc-dev