Fix broken refresh buttons

This makes the icon part of the button element rather than a separate element contained within.