wouldn't it be better to move teh units setting from the toolbar to an own options window.
I don't think the user will use this function that often, that it has deserve to be in the toolbar. normally the user just set this setting in the beginning or?