diff --git a/src/Resources/views/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig b/src/Resources/views/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig
new file mode 100644
index 00000000..cfa985ca
--- /dev/null
+++ b/src/Resources/views/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig
@@ -0,0 +1,7 @@
+{% if order.lastPayment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and order.lastPayment.state == 'cart' %}
+    {{ render(controller('Sylius\\PayPalPlugin\\Controller\\PayPalButtonsController:renderPayPalPaymentAction', {'orderId': order.id})) }}
+{% else %}
+    <button type="submit" class="ui huge primary fluid icon labeled button" {{ sylius_test_html_attribute('confirmation-button') }}>
+        <i class="check icon"></i> {{ 'sylius.ui.place_order'|trans }}
+    </button>
+{% endif %}
diff --git a/src/Resources/views/bundles/SyliusShopBundle/Checkout/complete.html.twig b/src/Resources/views/bundles/SyliusShopBundle/Checkout/complete.html.twig
deleted file mode 100644
index a8051651..00000000
--- a/src/Resources/views/bundles/SyliusShopBundle/Checkout/complete.html.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends '@SyliusShop/Checkout/layout.html.twig' %}
-
-{% form_theme form '@SyliusShop/Form/theme.html.twig' %}
-
-{% block content %}
-    {{ sylius_template_event(['sylius.shop.checkout.complete.steps', 'sylius.shop.checkout.steps'], _context|merge({'active': 'complete', 'orderTotal': order.total})) }}
-
-    <div class="ui padded segment">
-        {% include '@SyliusShop/Checkout/Complete/_header.html.twig' %}
-
-        {{ sylius_template_event('sylius.shop.checkout.complete.after_content_header', {'order': order}) }}
-
-        {% include '@SyliusShop/_flashes.html.twig' %}
-
-        {{ form_start(form, {'action': path('sylius_shop_checkout_complete'), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }}
-        {{ form_errors(form) }}
-        <input type="hidden" name="_method" value="PUT" />
-
-        {{ sylius_template_event('sylius.shop.checkout.complete.summary', _context) }}
-
-        <div class="ui hidden divider"></div>
-        {% include '@SyliusShop/Checkout/Complete/_form.html.twig' %}
-
-        {{ sylius_template_event('sylius.shop.checkout.complete.before_navigation', {'order': order}) }}
-
-        {% if order.lastPayment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and order.lastPayment.state == 'cart' %}
-            {{ render(controller('Sylius\\PayPalPlugin\\Controller\\PayPalButtonsController:renderPayPalPaymentAction', {'orderId': order.id})) }}
-        {% else %}
-            {% include '@SyliusShop/Checkout/Complete/_navigation.html.twig' %}
-        {% endif %}
-
-        {{ form_row(form._token) }}
-        {{ form_end(form, {'render_rest': false}) }}
-    </div>
-{% endblock %}
diff --git a/src/Resources/views/payWithPaypal.html.twig b/src/Resources/views/payWithPaypal.html.twig
index f578aaf6..ec9544ef 100644
--- a/src/Resources/views/payWithPaypal.html.twig
+++ b/src/Resources/views/payWithPaypal.html.twig
@@ -211,7 +211,7 @@
                 method: 'post',
                 headers: { 'content-type': 'application/json' },
                 body: JSON.stringify(err)
-            }).then(window.location.reload());
+            }).then(() => {setTimeout(window.location.reload, 300)});
         },
         onShippingChange: function(data, actions) {
             if (!availableCountries.filter(country => country === data.shipping_address.country_code).length) {