diff --git a/backend_qt/qzint.cpp b/backend_qt/qzint.cpp
index d0069eb1..9aa07744 100644
--- a/backend_qt/qzint.cpp
+++ b/backend_qt/qzint.cpp
@@ -30,7 +30,7 @@ namespace Zint {
         m_symbol = BARCODE_CODE128;
         m_height = 50;
         m_border = NO_BORDER;
-        m_borderWidth = 1;
+        m_borderWidth = 0;
         m_securityLevel = -1;
         m_pdf417CodeWords = 928;
         m_fgColor = Qt::black;
@@ -94,7 +94,7 @@ namespace Zint {
             case 4: m_border = BOX;
                 break;
         }
-        m_borderWidth = (BorderType) m_zintSymbol->border_width;
+        m_borderWidth = m_zintSymbol->border_width;
         m_whitespace = m_zintSymbol->whitespace_width;
     }
 
@@ -194,8 +194,8 @@ namespace Zint {
     }
 
     void QZint::setBorderWidth(int boderWidth) {
-        if (boderWidth < 1 || boderWidth > 16)
-            boderWidth = 1;
+        if (boderWidth < 0 || boderWidth > 16)
+            boderWidth = 0;
         m_borderWidth = boderWidth;
     }
 
@@ -347,8 +347,8 @@ namespace Zint {
         qreal gwidth = m_zintSymbol->width;
         qreal gheight = m_zintSymbol->height;
         if (m_zintSymbol->symbology == BARCODE_MAXICODE) {
-            gwidth = (33.0 * maxi_width) + xoffset + xoffset;
-            gheight = (32.0 * maxi_width) + yoffset + yoffset;
+            gwidth = (33.0 * maxi_width);
+            gheight = (32.0 * maxi_width);
         }
 
         if (m_zintSymbol->output_options & BARCODE_DOTTY_MODE) {
@@ -394,19 +394,19 @@ namespace Zint {
             switch (m_border) {
                 case BOX:
                     painter.fillRect(0, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor));
-                    painter.fillRect(m_zintSymbol->width + xoffset + xoffset + m_borderWidth, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor));
-                    painter.fillRect(0, 0, m_zintSymbol->width + xoffset + xoffset + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor));
-                    painter.fillRect(0, m_zintSymbol->height + m_borderWidth, m_zintSymbol->width + xoffset + xoffset + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor));
+                    painter.fillRect(m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width + m_borderWidth, m_borderWidth, m_borderWidth, m_zintSymbol->height, QBrush(m_fgColor));
+                    painter.fillRect(0, 0, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor));
+                    painter.fillRect(0, m_zintSymbol->height + m_borderWidth, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width + m_borderWidth + m_borderWidth, m_borderWidth, QBrush(m_fgColor));
                     painter.translate(m_borderWidth + m_zintSymbol->whitespace_width, m_borderWidth);
                     yoffset = m_borderWidth;
                     break;
                 case BIND:
                     if (m_zintSymbol->symbology != BARCODE_CODABLOCKF) {
-                        painter.fillRect(0, 0, m_zintSymbol->width + xoffset + xoffset, m_borderWidth, QBrush(m_fgColor));
-                        painter.fillRect(0, m_zintSymbol->height, m_zintSymbol->width + xoffset + xoffset, m_borderWidth, QBrush(m_fgColor));
+                        painter.fillRect(0, 0, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width, m_borderWidth, QBrush(m_fgColor));
+                        painter.fillRect(0, m_zintSymbol->height, m_zintSymbol->width + m_zintSymbol->whitespace_width + m_zintSymbol->whitespace_width, m_borderWidth, QBrush(m_fgColor));
                     } else {
-                        painter.fillRect(xoffset, 0, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor));
-                        painter.fillRect(xoffset, m_zintSymbol->height, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor));
+                        painter.fillRect(m_zintSymbol->whitespace_width, 0, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor));
+                        painter.fillRect(m_zintSymbol->whitespace_width, m_zintSymbol->height, m_zintSymbol->width, m_borderWidth, QBrush(m_fgColor));
                     }
                     painter.translate(m_zintSymbol->whitespace_width, m_borderWidth);
                     yoffset = m_borderWidth;
@@ -415,7 +415,6 @@ namespace Zint {
                 default:
                     painter.translate(m_zintSymbol->whitespace_width, 0);
                     break;
-                    ;
             }
         }