diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py
index 61808a6fb..67e54a824 100644
--- a/src/pretix/base/payment.py
+++ b/src/pretix/base/payment.py
@@ -1377,7 +1377,7 @@ class GiftCardPayment(BasePaymentProvider):
     execute_payment_needs_user = False
     verbose_name = _("Gift card")
     payment_form_class = GiftCardPaymentForm
-    payment_form_template_name = 'pretixcontrol/giftcards/checkout.html'
+    payment_form_template_name = 'pretixpresale/giftcard/checkout.html'
 
     @cached_property
     def customer_gift_cards(self):
@@ -1504,7 +1504,7 @@ class GiftCardPayment(BasePaymentProvider):
         return super().order_change_allowed(order) and self.event.organizer.has_gift_cards
 
     def checkout_confirm_render(self, request, order=None, info_data=None) -> str:
-        return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({
+        return get_template('pretixpresale/giftcard/checkout_confirm.html').render({
             'info_data': info_data,
         })
 
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index 3aac8dc43..224d2d2f2 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -9,34 +9,6 @@
 {% endblock %}
 {% block inner %}
     <h3 class="sr-only">{% trans "Payment" %}</h3>
-    {% if customer_gift_cards %}
-        <p><strong>
-            <span class="sr-only">{% trans "Information" %}</span>
-            {% trans "The following gift cards are available in your customer account:" %}
-        </strong></p>
-        <form method="post">
-            {% csrf_token %}
-            <ul class="list-group">
-                {% for c in customer_gift_cards %}
-                    <li class="list-group-item row">
-                        <div class="col-xs-9" id="gc-code-{{ forloop.counter }}">
-                            {{ c }}
-                        </div>
-                        <div class="col-xs-2 text-right" id="gc-value-{{ forloop.counter }}">
-                            {{ c.value|money:c.currency }}
-                        </div>
-                        <div class="col-xs-1 text-right">
-                            <button name="use_giftcard" value="{{ c.secret }}" title="{% trans "Use gift card" %}"
-                                    aria-describedby="gc-code-{{ forloop.counter }} gc-value-{{ forloop.counter }}"
-                                class="btn btn-primary btn-xs">
-                                {% trans "Apply" %}
-                            </button>
-                        </div>
-                    </li>
-                {% endfor %}
-            </ul>
-        </form>
-    {% endif %}
     {% if current_payments %}
         <p>{% trans "You already selected the following payment methods:" %}</p>
         <form method="post">
diff --git a/src/pretix/control/templates/pretixcontrol/giftcards/checkout.html b/src/pretix/presale/templates/pretixpresale/giftcard/checkout.html
similarity index 100%
rename from src/pretix/control/templates/pretixcontrol/giftcards/checkout.html
rename to src/pretix/presale/templates/pretixpresale/giftcard/checkout.html
diff --git a/src/pretix/control/templates/pretixcontrol/giftcards/checkout_confirm.html b/src/pretix/presale/templates/pretixpresale/giftcard/checkout_confirm.html
similarity index 100%
rename from src/pretix/control/templates/pretixcontrol/giftcards/checkout_confirm.html
rename to src/pretix/presale/templates/pretixpresale/giftcard/checkout_confirm.html