Fixed animations and change icons