Add icons to submit buttons

In 4.5 we got icons added to the buttons of popup forms, however the icons were missing if viewing the form as a standalone page.
This adds those icons and performs some cleanup related to css classes and button labels.

Marking as "user and admin doc" as a reminder to update screenshots in the book.