Fixing Thank button styling

This also requires removing the scoping from the default button
styles, which seems to not adversely affect anything.

Bug: 55596
Change-Id: I4f2431717868b2a9c257e5804b5ab1a01db01f8e