diff --git a/static/components/payment-dialog.js b/static/components/payment-dialog.js
index bd6f45c..7f470f2 100644
--- a/static/components/payment-dialog.js
+++ b/static/components/payment-dialog.js
@@ -104,15 +104,10 @@ window.app.component('tpos-payment-dialog', {
           v-text="tipSummary"
         ></span>
       </div>
-      <q-chip v-if="nfcTagReading && !isOnchain" square>
-        <q-avatar icon="nfc" color="positive" text-color="white"></q-avatar>
-        NFC supported
+      <q-chip square v-if="nfcTagReading && !isOnchain" label="NFC supported" icon="nfc" color="positive" text-color="white">
+      </q-chip>
+      <q-chip square v-else-if="!isOnchain" label="NFC not supported" icon="nfc_off" text-color="grey">
       </q-chip>
-      <div
-        v-else-if="!isOnchain"
-        class="text-caption text-grey"
-        v-text="'NFC not supported'"
-      ></div>
     </q-card-section>
 
     <q-card-actions align="between" class="q-pt-none">
diff --git a/templates/tpos/_cart.html b/templates/tpos/_cart.html
index 91abd13..89ce223 100644
--- a/templates/tpos/_cart.html
+++ b/templates/tpos/_cart.html
@@ -206,7 +206,7 @@ <h5 v-show="!denomIsSats" class="q-mt-none q-mb-sm">
             <div @click="addToCart(item)">
               <q-badge
                 v-if="itemCartQty(item.id) > 0"
-                class="z-top q-ma-sm"
+                class="z-marginals q-ma-sm"
                 color="primary"
                 :label="itemCartQty(item.id)"
                 floating
@@ -243,7 +243,7 @@ <h5 v-show="!denomIsSats" class="q-mt-none q-mb-sm">
             <div @click="addToCart(item)">
               <q-badge
                 v-if="itemCartQty(item.id) > 0"
-                class="z-top q-ma-sm"
+                class="z-marginals q-ma-sm"
                 color="primary"
                 :label="itemCartQty(item.id)"
                 floating
diff --git a/templates/tpos/dialogs.html b/templates/tpos/dialogs.html
index fc52599..adaee79 100644
--- a/templates/tpos/dialogs.html
+++ b/templates/tpos/dialogs.html
@@ -7,7 +7,7 @@
   >
     <q-card
       v-if="invoiceDialog.data"
-      class="q-pa-lg q-pt-xl lnbits__dialog-card"
+      class="q-pa-lg q-pt-xl lnbits__dialog-card full-width"
       style="max-height: 90vh"
     >
       <div