Quizmaker feedback results button order

I have a quiz and a test embedded in a module.  I am trying to get the the end of the quiz feedback buttons that display with the final quiz question popup after completing the quiz (no results page), and the test (with a results page) to display buttons in the same order.

I have two buttons in the quiz popup at the end of the quiz that read: "Finish" and "Retry Exercise".

The test results page displays two buttons: "Retry Quiz" and "Finish".

The test  results page doesn't display any buttons in slide or form view so I'm not able to change any order there, and the "Finish" button is loaded from Presenter.

Is there a way to get the "Finish" button to display last in both of these?