Bug 981887 - Update button design using current BB structure and "Plan B" design