Merge "Revert^2 "Change Overview Actions to round buttons."" into udc-qpr-dev