Changes to fix the disappearing of the grippy icon