Edit buttons: Dock-related fixes