Merge pull request #392 from svenjacobs/master

Button looses icon when loading state is changed