diff --git a/src/pretix/plugins/banktransfer/payment.py b/src/pretix/plugins/banktransfer/payment.py
index 192e0e34e..0e733cec3 100644
--- a/src/pretix/plugins/banktransfer/payment.py
+++ b/src/pretix/plugins/banktransfer/payment.py
@@ -47,6 +47,7 @@ from i18nfield.forms import I18nTextInput
 from i18nfield.strings import LazyI18nString
 from localflavor.generic.forms import BICFormField, IBANFormField
 from localflavor.generic.validators import IBANValidator
+from text_unidecode import unidecode
 
 from pretix.base.models import Order, OrderPayment, OrderRefund
 from pretix.base.payment import BasePaymentProvider
@@ -261,6 +262,51 @@ class BankTransfer(BasePaymentProvider):
         }
         return template.render(ctx)
 
+    def swiss_qrbill(self, payment):
+        if not self.settings.get('bank_details_sepa_iban') or not self.settings.get('bank_details_sepa_iban')[:2] in ('CH', 'LI'):
+            return
+        if self.event.currency not in ('EUR', 'CHF'):
+            return
+        if not self.event.settings.invoice_address_from or not self.event.settings.invoice_address_from_country:
+            return
+
+        data_fields = [
+            'SPC',
+            '0200',
+            '1',
+            self.settings.get('bank_details_sepa_iban'),
+            'K',
+            self.settings.get('bank_details_sepa_name')[:70],
+            self.event.settings.invoice_address_from.replace('\n', ', ')[:70],
+            (self.event.settings.invoice_address_from_zipcode + ' ' + self.event.settings.invoice_address_from_city)[:70],
+            '',
+            '',
+            str(self.event.settings.invoice_address_from_country),
+            '',  # rfu
+            '',  # rfu
+            '',  # rfu
+            '',  # rfu
+            '',  # rfu
+            '',  # rfu
+            '',  # rfu
+            str(payment.amount),
+            self.event.currency,
+            '',  # debtor address
+            '',  # debtor address
+            '',  # debtor address
+            '',  # debtor address
+            '',  # debtor address
+            '',  # debtor address
+            '',  # debtor address
+            'NON',
+            '',  # structured reference
+            self._code(payment.order),
+            'EPD',
+        ]
+
+        data_fields = [unidecode(d or '') for d in data_fields]
+        return '\r\n'.join(data_fields)
+
     def payment_pending_render(self, request: HttpRequest, payment: OrderPayment):
         template = get_template('pretixplugins/banktransfer/pending.html')
         ctx = {
@@ -269,6 +315,7 @@ class BankTransfer(BasePaymentProvider):
             'order': payment.order,
             'amount': payment.amount,
             'settings': self.settings,
+            'swiss_qrbill': self.swiss_qrbill(payment),
             'pending_description': self.settings.get('pending_description', as_type=LazyI18nString),
             'details': self.settings.get('bank_details', as_type=LazyI18nString),
         }
diff --git a/src/pretix/plugins/banktransfer/static/pretixplugins/banktransfer/swisscross.css b/src/pretix/plugins/banktransfer/static/pretixplugins/banktransfer/swisscross.css
new file mode 100644
index 000000000..7febb239a
--- /dev/null
+++ b/src/pretix/plugins/banktransfer/static/pretixplugins/banktransfer/swisscross.css
@@ -0,0 +1,15 @@
+.banktransfer-swiss-cross-overlay {
+    position: relative;
+    width: 150px;
+    height: 150px;
+    margin: 0 auto 10px;
+}
+.banktransfer-swiss-cross {
+    position: absolute;
+    width: 15.217%;
+    height: 15.217%;
+    left: 50%;
+    top: 50%;
+    margin-left: -7.609%;
+    margin-top: -7.609%;
+}
diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
index 0c986c478..98991d359 100644
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
+++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load l10n %}
 {% load commadecimal %}
+{% load static %}
 {% load dotdecimal %}
 {% load ibanformat %}
 {% load money %}
@@ -41,18 +42,32 @@
         </p>
     </div>
     {% if settings.bank_details_type == "sepa" %}
-        <div class="col-md-3 col-sm-6 hidden-xs text-center js-only">
-            <h4>BezahlCode</h4>
-            <p>
-            <a aria-label="{% trans "Open BezahlCode in your banking app to start the payment process." %}" href="bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}">
-                <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'BezahlCode for your order. Scan this image with your banking app’s QR-Reader to start the payment process.' %}">bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}</script>
-            </a>
-            </p>
-        </div>
-        <div class="col-md-3 col-sm-6 hidden-xs text-center js-only">
-            <h4>GiroCode / EPC-QR</h4>
-            <p>
-            <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'GiroCode / EPC-QR for your order. Scan this image with your banking app’s QR-Reader to start the payment process.' %}">BCD
+        <div class="col-md-6 col-sm-6 hidden-xs text-center js-only blank-after">
+            <ul class="nav nav-tabs" id="banktransfer_qrcodes_tabs" role="tablist">
+                {% if swiss_qrbill %}
+                    <li class="active"><a href="#banktransfer_qrcodes_qrbill" role="tab" id="banktransfer_qrcodes_qrbill_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_qrbill" aria-expanded="true">QR-bill</a></li>
+                {% endif %}
+                <li {% if not swiss_qrbill %}class="active"{% endif %}><a href="#banktransfer_qrcodes_girocode" role="tab" id="banktransfer_qrcodes_girocode_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_girocode" aria-expanded="{% if swiss_qrbill %}false{% else %}true{% endif %}">EPC-QR</a></li>
+                <li class=""><a href="#banktransfer_qrcodes_bezahlcode" role="tab" id="banktransfer_qrcodes_bezahlcode_tab" data-toggle="tab" aria-controls="banktransfer_qrcodes_bezahlcode" aria-expanded="false">BezahlCode</a></li>
+            </ul>
+            <div class="tab-content" id="banktransfer_qrcodes_tabs_content">
+                {% if swiss_qrbill %}
+                    <div id="banktransfer_qrcodes_qrbill" class="tab-pane fade active in" role="tabpanel" aria-labelledby="banktransfer_qrcodes_qrbill_tab">
+                        <p class="small">
+                            {% trans "Scan the qr-code with your banking app" %}
+                        </p>
+                        <p class="banktransfer-swiss-cross-overlay">
+                            <svg class="banktransfer-swiss-cross" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.8 19.8"><path stroke="#fff" stroke-width="1.436" d="M.7.7h18.4v18.4H.7z"/><path fill="#fff" d="M8.3 4h3.3v11H8.3z"/><path fill="#fff" d="M4.4 7.9h11v3.3h-11z"/></svg>
+                            <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">{{swiss_qrbill}}</script>
+                        </p>
+                    </div>
+                {% endif %}
+                <div id="banktransfer_qrcodes_girocode" class="tab-pane fade {% if not swiss_qrbill %}active in{% endif %}" role="tabpanel" aria-labelledby="banktransfer_qrcodes_girocode_tab">
+                    <p class="small">
+                        {% trans "Scan the qr-code with your banking app" %}
+                    </p>
+                    <p>
+                    <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">BCD
 002
 2
 SCT
@@ -65,15 +80,22 @@ SCT
 {{ code }}
 
             </script>
-            </p>
-        </div>
-        <div class="visible-xs-block text-center">
-            <p>
-                <a href="bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}" class="btn btn-default">
-                    {% trans "Open banking app" %}
-                </a><br>
-                <small>{% trans "Requires that the app supports BezahlCode" %}</small>
-            </p>
+                    </p>
+                </div>
+                <div id="banktransfer_qrcodes_bezahlcode" class="tab-pane fade" role="tabpanel" aria-labelledby="banktransfer_qrcodes_bezahlcode_tab">
+                    <p class="small">
+                        {% trans "Scan the qr-code with your banking app" %}
+                    </p>
+                    <p>
+                        <a aria-label="{% trans "Open BezahlCode in your banking app to start the payment process." %}" href="bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}">
+                        <script type="text/plain" data-size="150" data-replace-with-qr data-desc="{% trans 'Scan this image with your banking app’s QR-Reader to start the payment process.' %}">bank://singlepaymentsepa?name={{ settings.bank_details_sepa_name|urlencode }}&iban={{ settings.bank_details_sepa_iban }}&bic={{ settings.bank_details_sepa_bic }}&amount={{ amount|commadecimal }}&reason={{ code }}&currency={{ event.currency }}</script>
+                        </a>
+                    </p>
+                </div>
+            </div>
         </div>
     {% endif %}
 </div>
+{% if swiss_qrbill %}
+<link rel="stylesheet" href="{% static "pretixplugins/banktransfer/swisscross.css" %}">
+{% endif %}