bug-821623 [General][Building Blocks] Disabled Button States are incorrect

Addressed several small visual issues in all BB that included buttons