Use new button instead of generic menu entry

Use new button instead of generic menu entry