Mac OS Toolbar Not matching preferences

I'm having an issue, which I've actually lived with for quite some time and I suspect this started with some older versions of the IDE and then when I upgraded just followed me. However, I really want to sort these out.

My toolbar icons don't match the preferences I have set for them.

Here's my toolbar:

and my preferences:

As you can see, they kind of align, but there's obviously something in the toolbar that is out of sync and no matter what I've tried, I can't seem to get the toolbar to remove the 'target' like icons.

Anybody have any ideas on how to fix this?