Revert "New animation for image swapping"

This reverts commit 9fe7d7297886d9bc3e659a57d77b2c4e0bcc2f07.