Cosmetics + CustomTab bug