Issue 3407 mobile buttons

@jedp - could I get a review of this one?

Clean up buttons on mobile.