Revert "Merge pull request #20056 from EverythingMe/1016233-ui-styling"

This reverts commit 4099f6dc3ed6388507c4613b2d53183da21b106b, reversing
changes made to 3553e4fed932419b957e083fdda441358e4eb834.