Merge "Fixed that the shelf was animating the icons" into oc-dev