Fix play to pause icon change bug resulting from refactoring