Consistent button colors for disabled buttons

Closes #29263 and #29221

See merge request !9848