Fix toolbars with incorrect numbers