diff --git a/app/views/spree/admin/payments/_paypal_complete.html.erb b/app/views/spree/admin/payments/_paypal_complete.html.erb
index aaf088f7..40894091 100644
--- a/app/views/spree/admin/payments/_paypal_complete.html.erb
+++ b/app/views/spree/admin/payments/_paypal_complete.html.erb
@@ -1,12 +1,22 @@
 <%= form_tag paypal_refund_admin_order_payment_path(@order, @payment) do %>
-  <div class="label-block left five columns alpha">
+  <div class="label-block col-5">
     <div>
       <fieldset data-hook="admin_variant_new_form">
-        <legend><%= Spree.t('refund', :scope => :paypal) %></legend>
+        <legend>
+          <%= Spree.t('refund', :scope => :paypal) %>
+        </legend>
+        
         <div class='field'>
           <%= label_tag 'refund_amount', Spree.t(:refund_amount, :scope => 'paypal') %>
-          <small><em><%= Spree.t(:original_amount, :scope => 'paypal', :amount => @payment.display_amount) %></em></small><br>
+          <small>
+            <em>
+              <%= Spree.t(:original_amount, :scope => 'paypal', :amount => @payment.display_amount) %>
+            </em>
+          </small>
+          <br />
+          
           <% symbol = ::Money.new(1, Spree::Config[:currency]).symbol %>
+          
           <% if Spree::Config[:currency_symbol_position] == "before" %>
             <%= symbol %><%= text_field_tag 'refund_amount', @payment.amount %>
           <% else %>
diff --git a/app/views/spree/admin/payments/paypal_refund.html.erb b/app/views/spree/admin/payments/paypal_refund.html.erb
index 829ab11d..3e76dd6c 100644
--- a/app/views/spree/admin/payments/paypal_refund.html.erb
+++ b/app/views/spree/admin/payments/paypal_refund.html.erb
@@ -7,7 +7,7 @@
 <% end %>
 
 <%= form_tag paypal_refund_admin_order_payment_path(@order, @payment) do %>
-  <div class="label-block left five columns alpha">
+  <div class="label-block col-5">
     <div>
       <fieldset data-hook="admin_variant_new_form">
         <legend><%= Spree.t('refund', :scope => :paypal) %></legend>
diff --git a/app/views/spree/admin/payments/source_views/_paypal.html.erb b/app/views/spree/admin/payments/source_views/_paypal.html.erb
index eeb3a76a..40bb7f40 100644
--- a/app/views/spree/admin/payments/source_views/_paypal.html.erb
+++ b/app/views/spree/admin/payments/source_views/_paypal.html.erb
@@ -1,8 +1,10 @@
 <fieldset data-hook="paypal">
-  <legend align="center"><%= Spree.t(:transaction, :scope => :paypal) %></legend>
+  <legend align="center">
+    <%= Spree.t(:transaction, :scope => :paypal) %>
+  </legend>
 
   <div class="row">
-    <div class="alpha six columns">
+    <div class="col-6">
       <dl>
         <dt><%= Spree.t(:payer_id, :scope => :paypal) %>:</dt>
         <dd><%= payment.source.payer_id %></dd>
@@ -18,7 +20,7 @@
     <% if payment.source.state != 'refunded' %>
       <%= button_link_to Spree.t('actions.refund', scope: :paypal), spree.paypal_refund_admin_order_payment_path(@order, payment), icon: 'money' %>
     <% else %>
-      <div class="alpha six columns">
+      <div class="col-6">
         <dl>
           <dt><%= Spree.t(:state, :scope => :paypal) %>:</dt>
           <dd><%= payment.source.state.titleize %></dd>
diff --git a/app/views/spree/checkout/payment/_paypal.html.erb b/app/views/spree/checkout/payment/_paypal.html.erb
index f01452e3..84f9c715 100644
--- a/app/views/spree/checkout/payment/_paypal.html.erb
+++ b/app/views/spree/checkout/payment/_paypal.html.erb
@@ -1,6 +1,11 @@
-
-<%= link_to(image_tag("https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif"), paypal_express_url(:payment_method_id => payment_method.id), :method => :post, :id => "paypal_button") %>
-
+<div class="mt-3">
+  <%= link_to(
+    image_tag("https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif"),
+    paypal_express_url(:payment_method_id => payment_method.id),
+    :method => :post,
+    :id => "paypal_button"
+  ) %>
+</div>
 <script>
   SpreePaypalExpress.paymentMethodID = "<%= payment_method.id %>"  
  </script>
\ No newline at end of file