Use new button instead of generic menu entry