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