Fix animation incosistancy.. Also, new icons