Cmd-M on ephemeral blocks adds to layout, fix iconbutton tooltips

Cmd-M on ephemeral blocks adds to layout, fix iconbutton tooltips #4670