Revert change to control button and fix tooltip [story:45635355]