Merge "Revert^2 "Refactor/clean up Overview Actions buttons"" into main