diff --git a/www/assets/css/app.css b/www/assets/css/app.css
index 523862f..c6591fe 100644
--- a/www/assets/css/app.css
+++ b/www/assets/css/app.css
@@ -19,6 +19,10 @@ Framework7 and FontAwesome both have a .fab class
     line-height: var(--f7-line-height);
 }
 
+.button .fas, .button .far, .button .fal {
+    margin-right: 0.3rem;
+}
+
 .page {
     background-color: #d0f2fc;
     background-image: url(../images/background.svg);
diff --git a/www/pages/account.html b/www/pages/account.html
index 189ec03..2ce0a77 100644
--- a/www/pages/account.html
+++ b/www/pages/account.html
@@ -33,7 +33,7 @@
                         <div id="hasaccountbox" style="display: none;">
                             <div id="addPaymentMethodBox" style="display: none;">
                                 Add a credit or debit card to use Drop and Send. It'll be securely saved for future use.
-                                <div class="button hapticbtn button-fill margin" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card fa-fw"></i>&nbsp;Add Card</div>
+                                <div class="button hapticbtn button-fill margin" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card fa-fw"></i> Add Card</div>
                                 <hr />
                             </div>
                             <div class="card-content-padding">
@@ -46,7 +46,7 @@
                                 <img id="loyaltyBarcodeImg" style="width: 90%; max-width: 300px; padding: 1.2em; background: white; display: none;" />
                             </div>
                             <div class="block">
-                                <div class="button hapticbtn popup-open button-outline" data-popup="#accountUpdatePopup"><i class="fas fa-edit fa-fw"></i>&nbsp;Update account details</div>
+                                <div class="button hapticbtn popup-open button-outline" data-popup="#accountUpdatePopup"><i class="fas fa-edit fa-fw"></i> Update account details</div>
                             </div>
                             <div id="loyaltyErrorMessage"></div>
                             <div class="block margin-top">
@@ -119,7 +119,7 @@
                                 </ul>
                             </div>
                             <div class="card-content-padding">
-                                <div class="button hapticbtn button-fill" id="setupAccountBtn"><i class="far fa-plus fa-fw"></i>&nbsp;Setup Account</div>
+                                <div class="button hapticbtn button-fill" id="setupAccountBtn"><i class="far fa-plus fa-fw"></i> Setup Account</div>
                             </div>
                         </div>
                     </div>
@@ -173,10 +173,10 @@
             </ul>
         </div>
         <div class="card-content-padding">
-            <div class="button hapticbtn button-outline" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card fa-fw"></i>&nbsp;Add New Card</div>
+            <div class="button hapticbtn button-outline" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card fa-fw"></i> Add New Card</div>
         </div>
         <div class="card-content-padding">
-            <div class="button button-fill hapticbtn" id="updateAccountBtn"><i class="far fa-edit fa-fw"></i>&nbsp;Update Account</div>
+            <div class="button button-fill hapticbtn" id="updateAccountBtn"><i class="far fa-edit fa-fw"></i> Update Account</div>
         </div>
         <div class="block text-align-center">
             <p><a class="button popup-close" href="#">Cancel</a></p>
diff --git a/www/pages/rates.html b/www/pages/rates.html
index ed7ec43..27a6374 100644
--- a/www/pages/rates.html
+++ b/www/pages/rates.html
@@ -455,7 +455,7 @@
                         </div>
                     </div>
                     <div class="card-content-padding">
-                        <div class="button hapticbtn button-fill" onclick="getRates()"><i class="far fa-calculator"></i>&nbsp;Get Rates</div>
+                        <div class="button hapticbtn button-fill" onclick="getRates()"><i class="far fa-calculator"></i> Get Rates</div>
                     </div>
                 </div>
             </div>
diff --git a/www/pages/track.html b/www/pages/track.html
index ac24e75..7cd3256 100644
--- a/www/pages/track.html
+++ b/www/pages/track.html
@@ -30,7 +30,7 @@
                                     <div class="item-inner">
                                         <div class="item-title item-floating-label">Tracking Code</div>
                                         <div class="item-input-wrap">
-                                            <input type="text" name="trackingcode" id="trackingcode" required validate data-error-message="&nbsp;" placeholder="" autocomplete="off" autocorrect="off" autocapitalize="off" />
+                                            <input type="text" name="trackingcode" id="trackingcode" required validate data-error-message=" " placeholder="" autocomplete="off" autocorrect="off" autocapitalize="off" />
                                             <span class="input-clear-button"></span>
                                         </div>
                                     </div>