Fixed icon jumping and added roll button.