diff --git a/browser/components/payments/res/paymentRequest.xhtml b/browser/components/payments/res/paymentRequest.xhtml
index dd25d5989960..38e8c56363ff 100644
--- a/browser/components/payments/res/paymentRequest.xhtml
+++ b/browser/components/payments/res/paymentRequest.xhtml
@@ -10,6 +10,8 @@
 
   <!ENTITY viewAllItems               "View All Items">
   <!ENTITY paymentSummaryTitle        "Your Payment">
+  <!ENTITY header.payTo               "Pay to">
+
   <!ENTITY shippingAddressLabel       "Shipping Address">
   <!ENTITY deliveryAddressLabel       "Delivery Address">
   <!ENTITY pickupAddressLabel         "Pickup Address">
@@ -83,17 +85,15 @@
       <div id="total">
         <h2 class="label"></h2>
         <currency-amount></currency-amount>
-        <div id="host-name"></div>
+        <div>&header.payTo; <span id="host-name"></span></div>
       </div>
-      <div id="top-buttons" >
+      <div id="top-buttons" hidden="hidden">
         <button id="view-all" class="closed">&viewAllItems;</button>
       </div>
     </header>
 
     <div id="main-container">
       <section id="payment-summary" class="page">
-        <h2>&paymentSummaryTitle;</h2>
-
         <section>
           <div id="error-text"></div>
 
diff --git a/browser/components/payments/test/mochitest/test_payment_dialog.html b/browser/components/payments/test/mochitest/test_payment_dialog.html
index b96b96dee65a..17e791d5edce 100644
--- a/browser/components/payments/test/mochitest/test_payment_dialog.html
+++ b/browser/components/payments/test/mochitest/test_payment_dialog.html
@@ -8,6 +8,7 @@ Test the payment-dialog custom element
   <title>Test the payment-dialog element</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/AddTask.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script src="sinon-2.3.2.js"></script>
   <script src="payments_common.js"></script>
   <script src="../../res/vendor/custom-elements.min.js"></script>
@@ -93,6 +94,7 @@ add_task(async function test_viewAllButtonVisibility() {
 
   let button = el1._viewAllButton;
   ok(button.hidden, "Button is initially hidden when there are no items to show");
+  ok(isHidden(button), "Button should be visibly hidden since bug 1469464")
 
   // Add a display item.
   let request = deepClone(el1.requestStore.getState().request);