Injector: Improve button class management