Various icon tweaks, especially for better theme integration

It's probably better to store the 2 icons in a local variable and use them in the setIcon.