diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java
index 29636a8c..85d66772 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java
@@ -152,6 +152,11 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
             dialogPane.getButtonTypes().add(scanButtonType);
         }
 
+        ButtonBar buttonBar = (ButtonBar)dialogPane.lookup(".button-bar");
+        if(buttonBar != null) {
+            buttonBar.setButtonOrder("L+B+C+O");
+        }
+
         dialogPane.setPrefWidth(40 + qrSize + 40);
         dialogPane.setPrefHeight(40 + qrSize + 85);
         dialogPane.setMinHeight(dialogPane.getPrefHeight());
@@ -428,7 +433,7 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
         }
 
         private void updateDensityButton(Button density) {
-            density.setText(Config.get().getQrDensity() == QRDensity.NORMAL ? "Decrease Density" : "Increase Density");
+            density.setText(Config.get().getQrDensity() == QRDensity.NORMAL ? "Less Dense" : "More Dense");
             if(Config.get().getQrDensity() == QRDensity.NORMAL) {
                 density.setGraphic(getGlyph(FontAwesome5.Glyph.MAGNIFYING_GLASS_PLUS));
             } else {
diff --git a/src/main/resources/image/qrencoding/bbqr-icon-invert.svg b/src/main/resources/image/qrencoding/bbqr-icon-invert.svg
index 6eb6df3a..0a98f71d 100644
--- a/src/main/resources/image/qrencoding/bbqr-icon-invert.svg
+++ b/src/main/resources/image/qrencoding/bbqr-icon-invert.svg
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" viewBox="0 0 15 15" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.92157%,82.352942%,82.352942%);fill-opacity:1;" d="M 1.433594 3.285156 C 1.433594 2.453125 2.109375 1.78125 2.9375 1.78125 L 12.0625 1.78125 C 12.890625 1.78125 13.566406 2.453125 13.566406 3.285156 L 13.566406 11.683594 C 13.566406 12.511719 12.890625 13.1875 12.0625 13.1875 L 2.9375 13.1875 C 2.109375 13.1875 1.433594 12.511719 1.433594 11.683594 Z M 1.433594 3.285156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 4.351562 6.257812 L 6.125 6.257812 L 6.125 7.144531 L 3.460938 7.144531 L 3.460938 2.707031 L 6.125 2.707031 L 6.125 3.59375 L 4.351562 3.59375 L 4.351562 4.480469 L 6.125 4.480469 L 6.125 5.367188 L 4.351562 5.367188 Z M 7.011719 4.480469 L 6.125 4.480469 L 6.125 3.59375 L 7.011719 3.59375 Z M 7.011719 6.257812 L 6.125 6.257812 L 6.125 5.367188 L 7.011719 5.367188 Z M 7.011719 6.257812 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 9.019531 6.257812 L 10.792969 6.257812 L 10.792969 7.144531 L 8.132812 7.144531 L 8.132812 2.707031 L 10.792969 2.707031 L 10.792969 3.59375 L 9.019531 3.59375 L 9.019531 4.480469 L 10.792969 4.480469 L 10.792969 5.367188 L 9.019531 5.367188 Z M 11.683594 4.480469 L 10.792969 4.480469 L 10.792969 3.59375 L 11.683594 3.59375 Z M 11.683594 6.257812 L 10.792969 6.257812 L 10.792969 5.367188 L 11.683594 5.367188 Z M 11.683594 6.257812 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 4.351562 8.742188 L 4.351562 7.855469 L 6.125 7.855469 L 6.125 8.742188 Z M 4.351562 11.40625 L 3.460938 11.40625 L 3.460938 8.742188 L 4.351562 8.742188 Z M 6.125 10.519531 L 6.125 8.742188 L 7.011719 8.742188 L 7.011719 10.519531 Z M 6.125 11.40625 L 5.238281 11.40625 L 5.238281 10.519531 L 6.125 10.519531 Z M 5.238281 11.40625 L 5.238281 12.292969 L 4.351562 12.292969 L 4.351562 11.40625 Z M 6.125 12.292969 L 6.125 11.40625 L 7.011719 11.40625 L 7.011719 12.292969 Z M 6.125 12.292969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 9.4375 12.292969 L 8.546875 12.292969 L 8.546875 8.742188 L 10.324219 8.742188 L 10.324219 9.632812 L 9.4375 9.632812 Z M 9.4375 12.292969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.92157%,82.352942%,82.352942%);fill-opacity:1;" d="M 2.808594 1.621094 L 12.179688 1.621094 C 12.789062 1.621094 13.285156 2.117188 13.285156 2.730469 L 13.285156 12.257812 C 13.285156 12.867188 12.789062 13.363281 12.179688 13.363281 L 2.808594 13.363281 C 2.195312 13.363281 1.699219 12.867188 1.699219 12.257812 L 1.699219 2.730469 C 1.699219 2.117188 2.195312 1.621094 2.808594 1.621094 Z M 2.808594 1.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 2.707031 2.53125 L 6.140625 2.53125 L 6.925781 3.207031 L 6.925781 4.527344 L 6.609375 4.804688 L 7.167969 5.292969 L 7.167969 6.527344 L 6.320312 7.257812 L 2.707031 7.257812 Z M 5.59375 4.507812 L 5.875 4.265625 L 5.875 3.535156 L 5.601562 3.300781 L 3.746094 3.300781 L 3.746094 4.507812 Z M 5.78125 6.488281 L 6.117188 6.195312 L 6.117188 5.535156 L 5.78125 5.246094 L 3.746094 5.246094 L 3.746094 6.488281 Z M 5.78125 6.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 7.976562 2.53125 L 11.410156 2.53125 L 12.195312 3.207031 L 12.195312 4.527344 L 11.882812 4.804688 L 12.4375 5.292969 L 12.4375 6.527344 L 11.59375 7.257812 L 7.976562 7.257812 C 7.976562 7.257812 7.976562 2.53125 7.976562 2.53125 Z M 10.863281 4.507812 L 11.144531 4.265625 L 11.144531 3.535156 L 10.871094 3.300781 L 9.015625 3.300781 L 9.015625 4.507812 C 9.015625 4.507812 10.863281 4.507812 10.863281 4.507812 Z M 11.050781 6.488281 L 11.386719 6.195312 L 11.386719 5.535156 L 11.050781 5.246094 L 9.015625 5.246094 L 9.015625 6.488281 Z M 11.050781 6.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 5.957031 12.8125 L 5.570312 12.480469 L 3.605469 12.480469 L 2.707031 11.703125 L 2.707031 8.53125 L 3.605469 7.753906 L 6.265625 7.753906 L 7.167969 8.53125 L 7.167969 11.703125 L 6.585938 12.203125 L 7.277344 12.8125 Z M 5.78125 11.695312 L 6.179688 11.351562 L 6.179688 8.878906 L 5.78125 8.535156 L 4.089844 8.535156 L 3.691406 8.878906 L 3.691406 11.351562 L 4.089844 11.695312 C 4.089844 11.695312 5.78125 11.695312 5.78125 11.695312 Z M 5.78125 11.695312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 12.4375 10.921875 L 12.4375 12.488281 L 11.371094 12.488281 L 11.371094 11.128906 L 10.746094 10.675781 L 9.039062 10.675781 L 9.039062 12.488281 L 7.976562 12.488281 L 7.976562 7.761719 L 11.355469 7.761719 L 12.195312 8.488281 L 12.195312 9.921875 L 11.71875 10.386719 Z M 9.039062 9.921875 L 10.871094 9.921875 L 11.144531 9.683594 L 11.144531 8.765625 L 10.871094 8.53125 L 9.039062 8.53125 Z M 9.039062 9.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 5.355469 11.0625 L 5.558594 10.882812 L 5.558594 9.363281 L 5.355469 9.183594 L 4.511719 9.183594 L 4.304688 9.363281 L 4.304688 10.882812 L 4.511719 11.0625 Z M 5.355469 11.0625 "/>
 </g>
 </svg>
diff --git a/src/main/resources/image/qrencoding/bbqr-icon.svg b/src/main/resources/image/qrencoding/bbqr-icon.svg
index cfd63741..ab629c2a 100644
--- a/src/main/resources/image/qrencoding/bbqr-icon.svg
+++ b/src/main/resources/image/qrencoding/bbqr-icon.svg
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" viewBox="0 0 15 15" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 1.433594 3.285156 C 1.433594 2.453125 2.109375 1.78125 2.9375 1.78125 L 12.0625 1.78125 C 12.890625 1.78125 13.566406 2.453125 13.566406 3.285156 L 13.566406 11.683594 C 13.566406 12.511719 12.890625 13.1875 12.0625 13.1875 L 2.9375 13.1875 C 2.109375 13.1875 1.433594 12.511719 1.433594 11.683594 Z M 1.433594 3.285156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.351562 6.257812 L 6.125 6.257812 L 6.125 7.144531 L 3.460938 7.144531 L 3.460938 2.707031 L 6.125 2.707031 L 6.125 3.59375 L 4.351562 3.59375 L 4.351562 4.480469 L 6.125 4.480469 L 6.125 5.367188 L 4.351562 5.367188 Z M 7.011719 4.480469 L 6.125 4.480469 L 6.125 3.59375 L 7.011719 3.59375 Z M 7.011719 6.257812 L 6.125 6.257812 L 6.125 5.367188 L 7.011719 5.367188 Z M 7.011719 6.257812 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.019531 6.257812 L 10.792969 6.257812 L 10.792969 7.144531 L 8.132812 7.144531 L 8.132812 2.707031 L 10.792969 2.707031 L 10.792969 3.59375 L 9.019531 3.59375 L 9.019531 4.480469 L 10.792969 4.480469 L 10.792969 5.367188 L 9.019531 5.367188 Z M 11.683594 4.480469 L 10.792969 4.480469 L 10.792969 3.59375 L 11.683594 3.59375 Z M 11.683594 6.257812 L 10.792969 6.257812 L 10.792969 5.367188 L 11.683594 5.367188 Z M 11.683594 6.257812 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.351562 8.742188 L 4.351562 7.855469 L 6.125 7.855469 L 6.125 8.742188 Z M 4.351562 11.40625 L 3.460938 11.40625 L 3.460938 8.742188 L 4.351562 8.742188 Z M 6.125 10.519531 L 6.125 8.742188 L 7.011719 8.742188 L 7.011719 10.519531 Z M 6.125 11.40625 L 5.238281 11.40625 L 5.238281 10.519531 L 6.125 10.519531 Z M 5.238281 11.40625 L 5.238281 12.292969 L 4.351562 12.292969 L 4.351562 11.40625 Z M 6.125 12.292969 L 6.125 11.40625 L 7.011719 11.40625 L 7.011719 12.292969 Z M 6.125 12.292969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.496094 12.292969 L 8.605469 12.292969 L 8.605469 8.742188 L 10.382812 8.742188 L 10.382812 9.632812 L 9.496094 9.632812 Z M 9.496094 12.292969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,14.117648%,14.117648%);fill-opacity:1;" d="M 2.808594 1.621094 L 12.179688 1.621094 C 12.789062 1.621094 13.285156 2.117188 13.285156 2.730469 L 13.285156 12.257812 C 13.285156 12.867188 12.789062 13.363281 12.179688 13.363281 L 2.808594 13.363281 C 2.195312 13.363281 1.699219 12.867188 1.699219 12.257812 L 1.699219 2.730469 C 1.699219 2.117188 2.195312 1.621094 2.808594 1.621094 Z M 2.808594 1.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 2.707031 2.53125 L 6.140625 2.53125 L 6.925781 3.207031 L 6.925781 4.527344 L 6.609375 4.804688 L 7.167969 5.292969 L 7.167969 6.527344 L 6.320312 7.257812 L 2.707031 7.257812 Z M 5.59375 4.507812 L 5.875 4.265625 L 5.875 3.535156 L 5.601562 3.300781 L 3.746094 3.300781 L 3.746094 4.507812 Z M 5.78125 6.488281 L 6.117188 6.195312 L 6.117188 5.535156 L 5.78125 5.246094 L 3.746094 5.246094 L 3.746094 6.488281 Z M 5.78125 6.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.976562 2.53125 L 11.410156 2.53125 L 12.195312 3.207031 L 12.195312 4.527344 L 11.882812 4.804688 L 12.4375 5.292969 L 12.4375 6.527344 L 11.59375 7.257812 L 7.976562 7.257812 C 7.976562 7.257812 7.976562 2.53125 7.976562 2.53125 Z M 10.863281 4.507812 L 11.144531 4.265625 L 11.144531 3.535156 L 10.871094 3.300781 L 9.015625 3.300781 L 9.015625 4.507812 C 9.015625 4.507812 10.863281 4.507812 10.863281 4.507812 Z M 11.050781 6.488281 L 11.386719 6.195312 L 11.386719 5.535156 L 11.050781 5.246094 L 9.015625 5.246094 L 9.015625 6.488281 Z M 11.050781 6.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.957031 12.8125 L 5.570312 12.480469 L 3.605469 12.480469 L 2.707031 11.703125 L 2.707031 8.53125 L 3.605469 7.753906 L 6.265625 7.753906 L 7.167969 8.53125 L 7.167969 11.703125 L 6.585938 12.203125 L 7.277344 12.8125 Z M 5.78125 11.695312 L 6.179688 11.351562 L 6.179688 8.878906 L 5.78125 8.535156 L 4.089844 8.535156 L 3.691406 8.878906 L 3.691406 11.351562 L 4.089844 11.695312 C 4.089844 11.695312 5.78125 11.695312 5.78125 11.695312 Z M 5.78125 11.695312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.4375 10.921875 L 12.4375 12.488281 L 11.371094 12.488281 L 11.371094 11.128906 L 10.746094 10.675781 L 9.039062 10.675781 L 9.039062 12.488281 L 7.976562 12.488281 L 7.976562 7.761719 L 11.355469 7.761719 L 12.195312 8.488281 L 12.195312 9.921875 L 11.71875 10.386719 Z M 9.039062 9.921875 L 10.871094 9.921875 L 11.144531 9.683594 L 11.144531 8.765625 L 10.871094 8.53125 L 9.039062 8.53125 Z M 9.039062 9.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.355469 11.0625 L 5.558594 10.882812 L 5.558594 9.363281 L 5.355469 9.183594 L 4.511719 9.183594 L 4.304688 9.363281 L 4.304688 10.882812 L 4.511719 11.0625 Z M 5.355469 11.0625 "/>
 </g>
 </svg>