Fix button animations

[raphaelsalaja]

Problem

The button text fades in incorrectly, as well as this, when switching from a button without an icon to an icon, the whole text fades in, instead of adding the icon.

Steps To Reproduce

Click on the button within the layer.

Expected Behaviour

The button text should have an opacity transition rather than what is there at the moment.