Double-button inconsistencies (post menu)

[awesomerobot (Kris)]

looks like this predates the glimmer version of the menu, but there are indeed some inconsistencies here we can clean up. Thanks for reporting it!