diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index c75ffa74b..f5320d954 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -1,5 +1,6 @@
 {% extends "pretixpresale/event/checkout_base.html" %}
 {% load i18n %}
+{% load icon %}
 {% load bootstrap3 %}
 {% load rich_text %}
 {% load lists %}
@@ -74,14 +75,6 @@
                             {% if pos.variation %}
                                 – {{ pos.variation }}
                             {% endif %}</strong>
-                            {% if forloop.counter > 1 %}
-                                <span class="text-right flip">
-                                    {% if event.settings.checkout_show_copy_answers_button %}
-                                        <button type="button" data-id="{{ forloop.counter0 }}" name="copy"
-                                                class="js-copy-answers btn btn-default btn-xs">{% trans "Copy answers from above" %}</button>
-                                    {% endif %}
-                                </span>
-                            {% endif %}
                         </h3>
                     </summary>
                     <div>
@@ -89,6 +82,17 @@
                             {% if event.settings.attendee_data_explanation_text and pos.item.ask_attendee_data %}
                                 {{ event.settings.attendee_data_explanation_text|rich_text }}
                             {% endif %}
+                            {% if forloop.counter > 1 and event.settings.checkout_show_copy_answers_button %}
+                                <div class="form-group">
+                                    <div class="col-md-9 col-md-offset-3">
+                                        <button type="button" data-id="{{ forloop.counter0 }}" name="copy"
+                                            class="js-copy-answers btn btn-default btn-sm">
+                                                {% icon "files-o" %}
+                                                {% trans "Copy answers from above" %}
+                                            </button>
+                                    </div>
+                                </div>
+                            {% endif %}
                             {% if pos.seat %}
                                 <div class="form-group">
                                     <label class="col-md-3 control-label">
@@ -127,15 +131,14 @@
                                     </div>
                                 </div>
                             {% endif %}
+                            <fieldset>
+                                <legend class="sr-only">{{ pos.item.name }}{% if pos.variation %} – {{ pos.variation }}{% endif %}</legend>
                             {% for form in forms %}
                                 {% if form.pos.item != pos.item %}
+                                </fieldset>
+                                <fieldset>
                                     {# Add-Ons #}
                                     <legend{% if profiles_data %} class="profile-add-on-legend"{% endif %}>
-                                        {% if form.show_copy_answers_to_addon_button and event.settings.checkout_show_copy_answers_button %}
-                                            <span class="pull-right flip">
-                                                <button type="button" data-id="{{ forloop.parentloop.counter0 }}" data-addonid="{{ forloop.counter0 }}" name="copy" class="js-copy-answers-addon btn btn-default btn-xs">{% trans "Copy answers" %}</button>
-                                            </span>
-                                        {% endif %}
                                         + {{ form.pos.item.name }}{% if form.pos.variation %} – {{ form.pos.variation.value }}{% endif %}
                                     </legend>
                                 {% endif %}
@@ -157,8 +160,20 @@
                                     </div>
                                     {% endif %}
 
+                                    {% if form.show_copy_answers_to_addon_button and event.settings.checkout_show_copy_answers_button %}
+                                    <div class="form-group">
+                                        <div class="col-md-9 col-md-offset-3">
+                                            <button type="button" data-id="{{ forloop.parentloop.counter0 }}" data-addonid="{{ forloop.counter0 }}" name="copy" class="js-copy-answers-addon btn btn-default btn-sm">
+                                                {% icon "files-o" %}
+                                                {% trans "Copy answers from above" %}
+                                            </button>
+                                        </div>
+                                    </div>
+                                    {% endif %}
+
                                     {% bootstrap_form form layout="checkout" %}
                                 </div>
+                            </fieldset>
                             {% endfor %}
                         </div>
                     </div>