We have two content type pickers in the system. On the one at Create on the Fly there is a button with which you need to confirm the selection, at Create content you do not need to confirm, just selecting the item takes you to the form.

Steps:

1. Go to Content structure.
2. Click Create content button.
3. Verify content type picker.

Result: No Create and Cancel buttons.

Expected result: Content Type picker has Create and Cancel buttons, as in COTF. (confirmed with UX). 
Also, buttons labels should be changed - Add->Create, Cancel->Discard 

This task also includes other views: taxonomy, create product, attributes, shipping method, payment method, categories