Toolbar: Some references to prefixed files were left