diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp
index e1a3b980..3a475397 100644
--- a/sleepyhead/Graphs/MinutesAtPressure.cpp
+++ b/sleepyhead/Graphs/MinutesAtPressure.cpp
@@ -116,7 +116,8 @@ float pressureMult = 5;
 
 void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &region)
 {
-    QRect rect = region.boundingRect();
+    QRectF rect = region.boundingRect();
+    rect.translate(0.0f, 0.001f);
 
 
     //int cells = m_maxpressure-m_minpressure+1;
@@ -127,7 +128,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
     float height = rect.height();
     float left = rect.left();
     //float pix = width / float(cells);
-    float bottom = rect.bottom()+1;
+    float bottom = rect.bottom();
 
 
     //int numchans = chans.size();
@@ -169,7 +170,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
 
     painter.setFont(*defaultfont);
     painter.setPen(Qt::black);
-    painter.drawRect(rect.left(),rect.top(), rect.width(), height+1);
+    painter.drawRect(rect);//rect.left(),rect.top(), rect.width(), height+1);
 
 
     int minpressure = qMin((EventStoreType)4, m_minpressure);
diff --git a/sleepyhead/Graphs/gFlagsLine.cpp b/sleepyhead/Graphs/gFlagsLine.cpp
index 1c27c57e..0b986345 100644
--- a/sleepyhead/Graphs/gFlagsLine.cpp
+++ b/sleepyhead/Graphs/gFlagsLine.cpp
@@ -148,8 +148,11 @@ bool gFlagsGroup::isEmpty()
 
 void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
 {
-    int left = region.boundingRect().left();
-    int top = region.boundingRect().top();
+    QRectF outline(region.boundingRect());
+    outline.translate(0.0f, 0.001f);
+
+    int left = region.boundingRect().left()+1;
+    int top = region.boundingRect().top()+1;
     int width = region.boundingRect().width();
     int height = region.boundingRect().height();
 
@@ -172,18 +175,12 @@ void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
     QColor barcol;
 
     for (int i=0, end=visflags.size(); i < end; i++) {
-        //schema::Channel & chan = schema::channel[visflags.at(i)->code()];
-
         // Alternating box color
         if (i & 1) { barcol = COLOR_ALT_BG1; }
         else { barcol = COLOR_ALT_BG2; }
 
         painter.fillRect(left, floor(linetop), width-1, ceil(m_barh), QBrush(barcol));
 
-//        barcol = chan.defaultColor();
-//        barcol.setAlpha(16);
-//        painter.fillRect(left, floor(linetop), width-1, ceil(m_barh), QBrush(barcol));
-
         // Paint the actual flags
         QRect rect(left, linetop, width, m_barh);
         visflags[i]->m_rect = rect;
@@ -192,10 +189,7 @@ void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
     }
 
     painter.setPen(COLOR_Outline);
-    painter.drawLine(left - 1, top, left - 1, top + height);
-    painter.drawLine(left - 1, top + height, left + width, top + height);
-    painter.drawLine(left + width, top + height, left + width, top);
-    painter.drawLine(left + width, top, left - 1, top);
+    painter.drawRect(outline);
 
     if (m_rebuild_cpap) {
 
diff --git a/sleepyhead/Graphs/gFooBar.cpp b/sleepyhead/Graphs/gFooBar.cpp
index 9fa093ba..eb335226 100644
--- a/sleepyhead/Graphs/gFooBar.cpp
+++ b/sleepyhead/Graphs/gFooBar.cpp
@@ -1,4 +1,4 @@
-/* gFooBar Implementation
+/* gFooBar Implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -22,10 +22,10 @@ gShadowArea::~gShadowArea()
 }
 void gShadowArea::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
-    int left = region.boundingRect().left();
-    int top = region.boundingRect().top();
-    int width = region.boundingRect().width();
-    int height = region.boundingRect().height();
+    float left = region.boundingRect().left()+1.0f;
+    float top = region.boundingRect().top()+0.001f;
+    float width = region.boundingRect().width();
+    float height = region.boundingRect().height();
 
     if (!m_visible) { return; }
 
@@ -35,8 +35,8 @@ void gShadowArea::paint(QPainter &painter, gGraph &w, const QRegion &region)
         return;
     }
 
-    int start_px = left - 1;
-    int end_px = left + width;
+    float start_px = left - 1;
+    float end_px = left + width;
 
     double rmx = w.rmax_x - w.rmin_x;
     double px = ((1.0 / rmx) * (w.min_x - w.rmin_x)) * width;
@@ -45,9 +45,10 @@ void gShadowArea::paint(QPainter &painter, gGraph &w, const QRegion &region)
     painter.fillRect(start_px, top, px, height, QBrush(m_shadow_color));
     painter.fillRect(start_px + py, top, end_px-start_px-py, height, QBrush(m_shadow_color));
 
-    painter.setPen(m_line_color);
-    painter.drawLine(start_px + px, top, start_px + py, top);
-    painter.drawLine(start_px + px, top + height + 1, start_px + py, top + height + 1);
+    painter.setPen(QPen(m_line_color,2));
+
+    painter.drawLine(QLineF(start_px + px, top, start_px + py, top));
+    painter.drawLine(QLineF(start_px + px, top + height + 1, start_px + py, top + height + 1));
 }
 
 gFooBar::gFooBar(int offset, QColor handle_color, QColor line_color)
diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 2848dbdd..20f0f72a 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -370,7 +370,8 @@ QString gLineChart::getMetaString(qint64 time)
 // Time Domain Line Chart
 void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
-    QRect rect = region.boundingRect();
+    QRectF rect = region.boundingRect();
+    rect.translate(0.0f, 0.001f);
     // TODO: Just use QRect directly.
     int left = rect.left();
     int top = rect.top();
@@ -473,7 +474,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
             int wid, h;
             GetTextExtent(text, wid, h);
-            w.renderText(text, left , top-h+7*w.printScaleY());  //+ width/2 - wid/2
+            w.renderText(text, left , top-6); //(h+(4 * w.printScaleY())));  //+ width/2 - wid/2
         }
     }
 
@@ -488,10 +489,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
     // Draw bounding box
     painter.setPen(QColor(Qt::black));
-    painter.drawLine(left, top, left, top + height);
-    painter.drawLine(left, top + height, left + width, top + height);
-    painter.drawLine(left + width, top + height, left + width, top);
-    painter.drawLine(left + width, top, left, top);
+    painter.drawRect(rect);
 
     width--;
     height -= 2;
@@ -988,13 +986,13 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
             painter.setPen(Qt::black);
             painter.drawText(rec, Qt::AlignBottom | Qt::AlignRight, text);
 
-            float ps = 1 * ratioY;
+            float ps = 2.0 * ratioY;
             ps = qMax(ps, 1.0f);
 
             painter.setPen(QPen(chan.defaultColor(), ps));
             int linewidth = (10 * ratioX);
             int yp = rec.top()+(rec.height()/2);
-            painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
+            painter.drawLine(QLineF(rec.left()-linewidth, yp+0.001f , rec.left()-(2 * ratioX), yp));
 
             painter.setClipping(true);
 
@@ -1022,12 +1020,12 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
         QColor color = chan.calc[dot.type].color;
         color.setAlpha(200);
-        float ps = 1 * ratioY;
+        float ps = 2.0 * ratioY;
         ps = qMax(ps, 1.0f);
         painter.setPen(QPen(QBrush(color), ps,Qt::DotLine));
 
         int yp = rec.top()+(rec.height()/2);
-        painter.drawLine(rec.left()-linewidth, yp , rec.left()-(2 * ratioX), yp);
+        painter.drawLine(QLineF(rec.left()-linewidth, yp+0.001f, rec.left()-(2 * ratioX), yp));
         legendx -= linewidth + (2*ratioX);
     }
 
@@ -1115,7 +1113,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
         if (linecursormode) txt+=lasttext;
 
-        w.renderText(txt,left,top-6);
+        w.renderText(txt,left,top-5);
     }
 
 
diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp
index ff783121..9ae0ddd4 100644
--- a/sleepyhead/Graphs/gLineOverlay.cpp
+++ b/sleepyhead/Graphs/gLineOverlay.cpp
@@ -381,5 +381,5 @@ void gLineOverlaySummary::paint(QPainter &painter, gGraph &w, const QRegion &reg
         a += " " + QObject::tr("(% %1 in events)").arg(sph, 0, 'f', 2);
     }
 
-    w.renderText(a, left + m_x, top + m_y);
+    w.renderText(a, left + m_x, top + m_y+2);
 }
diff --git a/sleepyhead/Graphs/gSessionTimesChart.cpp b/sleepyhead/Graphs/gSessionTimesChart.cpp
index f577c38f..a7479105 100644
--- a/sleepyhead/Graphs/gSessionTimesChart.cpp
+++ b/sleepyhead/Graphs/gSessionTimesChart.cpp
@@ -183,7 +183,7 @@ void gSummaryChart::customCalc(Day *day, QVector<SummaryChartSlice> & slices)
      }
 }
 
-void gSummaryChart::afterDraw(QPainter &painter, gGraph &graph, QRect rect)
+void gSummaryChart::afterDraw(QPainter &painter, gGraph &graph, QRectF rect)
 {
     if (totaldays == nousedays) return;
 
@@ -390,7 +390,9 @@ void gSummaryChart::populate(Day * day, int idx)
 
 void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &region)
 {
-    QRect rect = region.boundingRect();
+    QRectF rect = region.boundingRect();
+
+    rect.translate(0.0f, 0.001f);
 
     painter.setPen(QColor(Qt::black));
     painter.drawRect(rect);
@@ -688,7 +690,7 @@ void gUsageChart::customCalc(Day *, QVector<SummaryChartSlice> &list)
     calc.update(slice.value, 1);
 }
 
-void gUsageChart::afterDraw(QPainter &, gGraph &graph, QRect rect)
+void gUsageChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
 {
     if (totaldays == nousedays) return;
 
@@ -757,7 +759,7 @@ void gSessionTimesChart::customCalc(Day *, QVector<SummaryChartSlice> & slices)
     num_days++;
 }
 
-void gSessionTimesChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect rect)
+void gSessionTimesChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRectF rect)
 {
     if (totaldays == nousedays) return;
 
@@ -800,7 +802,7 @@ void gSessionTimesChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect
 
 void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &region)
 {
-    QRect rect = region.boundingRect();
+    QRectF rect = region.boundingRect();
 
     painter.setPen(QColor(Qt::black));
     painter.drawRect(rect);
@@ -978,7 +980,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
         //bool hl = false;
 
-        QRect rec2(lastx1, rect.top(), barw, rect.height());
+        QRectF rec2(lastx1, rect.top(), barw, rect.height());
         if (rec2.contains(mouse)) {
             QColor col2(255,0,0,64);
             painter.fillRect(rec2, QBrush(col2));
@@ -1001,7 +1003,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
                 QColor col = slice.color;
 
-                QRect rec(lastx1, rect.bottom() - y1 - y2, barw, y2);
+                QRectF rec(lastx1, rect.bottom() - y1 - y2, barw, y2);
                 rec = rec.intersected(rect);
 
                 if (rec.contains(mouse)) {
@@ -1052,7 +1054,7 @@ void gTTIAChart::customCalc(Day *, QVector<SummaryChartSlice> & slices)
     calcitems[0].update(slice.value, slice.value);
 }
 
-void gTTIAChart::afterDraw(QPainter &, gGraph &graph, QRect rect)
+void gTTIAChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
 {
     QStringList txtlist;
 
@@ -1161,7 +1163,7 @@ void gAHIChart::customCalc(Day *day, QVector<SummaryChartSlice> &list)
     total_hours += hours;
     total_days++;
 }
-void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRect rect)
+void gAHIChart::afterDraw(QPainter & /*painter */, gGraph &graph, QRectF rect)
 {
     if (totaldays == nousedays) return;
 
@@ -1277,7 +1279,7 @@ gPressureChart::gPressureChart()
     addCalc(CPAP_IPAP, ST_90P, brighten(schema::channel[CPAP_IPAP].defaultColor(),1.33f));         // 12
 }
 
-void gPressureChart::afterDraw(QPainter &, gGraph &graph, QRect rect)
+void gPressureChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)
 {
     int pressure_cnt = calcitems[0].cnt;
     int pressuremin_cnt = calcitems[3].cnt;
diff --git a/sleepyhead/Graphs/gSessionTimesChart.h b/sleepyhead/Graphs/gSessionTimesChart.h
index 733c63df..f812f1c7 100644
--- a/sleepyhead/Graphs/gSessionTimesChart.h
+++ b/sleepyhead/Graphs/gSessionTimesChart.h
@@ -179,7 +179,7 @@ public:
     virtual void customCalc(Day *, QVector<SummaryChartSlice> &);
 
     //! \brief Override to call stuff after draw is complete
-    virtual void afterDraw(QPainter &, gGraph &, QRect);
+    virtual void afterDraw(QPainter &, gGraph &, QRectF);
 
     //! \brief Return any extra data to show beneath the date in the hover over tooltip
     virtual QString tooltipData(Day *, int);
@@ -289,7 +289,7 @@ public:
 
     virtual void preCalc();
     virtual void customCalc(Day *, QVector<SummaryChartSlice> & slices);
-    virtual void afterDraw(QPainter &, gGraph &, QRect);
+    virtual void afterDraw(QPainter &, gGraph &, QRectF);
 
     //! \brief Renders the graph to the QPainter object
     virtual void paint(QPainter &painter, gGraph &graph, const QRegion &region);
@@ -325,7 +325,7 @@ public:
 
     virtual void preCalc();
     virtual void customCalc(Day *, QVector<SummaryChartSlice> &);
-    virtual void afterDraw(QPainter &, gGraph &, QRect);
+    virtual void afterDraw(QPainter &, gGraph &, QRectF);
     virtual void populate(Day *day, int idx);
 
     virtual QString tooltipData(Day * day, int);
@@ -359,7 +359,7 @@ public:
 
     virtual void preCalc();
     virtual void customCalc(Day *, QVector<SummaryChartSlice> &);
-    virtual void afterDraw(QPainter &, gGraph &, QRect);
+    virtual void afterDraw(QPainter &, gGraph &, QRectF);
     virtual void populate(Day *day, int idx);
     virtual QString tooltipData(Day * day, int);
 
@@ -392,7 +392,7 @@ public:
 
     virtual void preCalc();
     virtual void customCalc(Day *, QVector<SummaryChartSlice> &);
-    virtual void afterDraw(QPainter &, gGraph &, QRect);
+    virtual void afterDraw(QPainter &, gGraph &, QRectF);
 
     virtual void populate(Day *, int idx);
 
@@ -452,7 +452,7 @@ public:
             calc->update(slice.value, hour);
          }
     }
-    virtual void afterDraw(QPainter &, gGraph &, QRect);
+    virtual void afterDraw(QPainter &, gGraph &, QRectF);
 
     virtual void populate(Day * day, int idx);
 
diff --git a/sleepyhead/Graphs/gXAxis.cpp b/sleepyhead/Graphs/gXAxis.cpp
index 5a742a79..29a29d8d 100644
--- a/sleepyhead/Graphs/gXAxis.cpp
+++ b/sleepyhead/Graphs/gXAxis.cpp
@@ -69,13 +69,13 @@ const QString months[] = {
 
 void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
-    int left = region.boundingRect().left();
-    int top = region.boundingRect().top();
-    int width = region.boundingRect().width();
-    int height = region.boundingRect().height();
+    float left = region.boundingRect().left();
+    float top = region.boundingRect().top()-0.999f;
+    float width = region.boundingRect().width();
+    float height = region.boundingRect().height();
 
 
-    QVector<QLine> ticks;
+    QVector<QLineF> ticks;
 
 
     QPainter painter2; // Only need this for pixmap caching
@@ -266,9 +266,9 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
             if (py < start_px) { continue; }
 
             if (usepixmap) {
-                ticks.append(QLine(py - left + 20, 0, py - left + 20, mintop - top));
+                ticks.append(QLineF(py - left + 20, 0, py - left + 20, mintop - top));
             } else {
-                ticks.append(QLine(py, top+2, py, mintop+2));
+                ticks.append(QLineF(py, top+2, py, mintop+2));
             }
         }
 
@@ -280,9 +280,9 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
             px += left;
 
             if (usepixmap) {
-                ticks.append(QLine(px - left + 20, 0, px - left + 20, majtop - top));
+                ticks.append(QLineF(px - left + 20, 0, px - left + 20, majtop - top));
             } else {
-                ticks.append(QLine(px, top+2, px, majtop+2));
+                ticks.append(QLineF(px, top+2, px, majtop+2));
             }
 
             j = i;
@@ -333,9 +333,9 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
                 if (py >= left + width) { break; }
 
                 if (usepixmap) {
-                    ticks.append(QLine(py - left + 20, 0, py - left + 20, mintop - top));
+                    ticks.append(QLineF(py - left + 20, 0, py - left + 20, mintop - top));
                 } else {
-                    ticks.append(QLine(py, top+2, py, mintop+2));
+                    ticks.append(QLineF(py, top+2, py, mintop+2));
                 }
             }
         }
@@ -402,7 +402,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion &region)
     maxx = graph.max_x;
 
     QDateTime date2 = QDateTime::fromMSecsSinceEpoch(minx, Qt::UTC);
-    QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(maxx, Qt::UTC);
+ //   QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(maxx, Qt::UTC);
 
     //qInfo() << "Drawing date axis from " << date2 << " to " << enddate2;
 
@@ -430,7 +430,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion &region)
     float xpos = (barw / 2.0) - (float(x) / 2.0);
 
     float lastxpos = 0;
-    QVector<QLine> lines;
+    QVector<QLineF> lines;
     for (int i=0; i < days; i++) {
         if ((lastx + barw) > (left + width + 1))
             break;
@@ -442,7 +442,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion &region)
         if (x1 > (lastxpos + x + 8*graph.printScaleX())) {
             graph.renderText(tmpstr, x1, y1 + y + 8);
             lastxpos = x1;
-            lines.append(QLine(lastx+barw/2, top, lastx+barw/2, top+6));
+            lines.append(QLineF(lastx+barw/2, top, lastx+barw/2, top+6));
         }
         lastx = lastx + barw;
         date = date.addDays(1);
diff --git a/sleepyhead/Graphs/gYAxis.cpp b/sleepyhead/Graphs/gYAxis.cpp
index e2de9247..c926203c 100644
--- a/sleepyhead/Graphs/gYAxis.cpp
+++ b/sleepyhead/Graphs/gYAxis.cpp
@@ -1,4 +1,4 @@
-/* gYAxis Implementation
+/* gYAxis Implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -35,10 +35,10 @@ gXGrid::~gXGrid()
 }
 void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
-    int left = region.boundingRect().left();
-    int top = region.boundingRect().top()+1;
-    int width = region.boundingRect().width();
-    int height = region.boundingRect().height();
+    float left = region.boundingRect().left();
+    float top = region.boundingRect().top()+0.001f;
+    float width = region.boundingRect().width();
+    float height = region.boundingRect().height();
 
     //int x, y;
 
@@ -71,7 +71,7 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
     int myt;
     bool fnd = false;
 
-    for (myt = max_yticks; myt >= 1; myt--) {
+    for (myt = max_yticks; myt >= 1.001; myt--) {
         float v = rxy / float(myt);
 
         if (float(v) == int(v)) {
@@ -101,15 +101,15 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
     if (min_ytick >= 1000000) {
         min_ytick = 100;
     }
-    QVector<QLine> majorlines;
-    QVector<QLine> minorlines;
+    QVector<QLineF> majorlines;
+    QVector<QLineF> minorlines;
 
-    for (double i = miny; i <= maxy + min_ytick - 0.00001; i += min_ytick) {
+    for (double i = miny; i <= maxy + min_ytick + 0.001; i += min_ytick) {
         ty = (i - miny) * ymult;
         h = top + height - ty;
 
         if (m_show_major_lines && (i > miny)) {
-            majorlines.append(QLine(left, h, left + width, h));
+            majorlines.append(QLineF(left, h, left + width, h));
         }
 
         double z = (min_ytick / 4) * ymult;
@@ -125,7 +125,7 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
             //                break;
             //          }
             if (m_show_minor_lines) {// && (i > miny)) {
-                minorlines.append(QLine(left, g, left + width, g));
+                minorlines.append(QLineF(left, g, left + width, g));
             }
         }
     }
@@ -157,10 +157,10 @@ int gYAxis::minimumWidth()
 
 void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
 {
-    int left = region.boundingRect().left();
-    int top = region.boundingRect().top()+1;
-    int width = region.boundingRect().width();
-    int height = region.boundingRect().height();
+    float left = region.boundingRect().left();
+    float top = region.boundingRect().top()+0.001;
+    float width = region.boundingRect().width();
+    float height = region.boundingRect().height();
 
     int x, y; //,yh=0;
 
@@ -243,11 +243,11 @@ void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
             min_ytick = 100;
         }
 
-        QVector<QLine> ticks;
+        QVector<QLineF> ticks;
 
         QRect r2;
         float shorttick = 4.0 * w.printScaleX();
-        for (double i = miny; i <= maxy + min_ytick - 0.00001; i += min_ytick) {
+        for (double i = miny; i <= maxy + min_ytick + 0.001; i += min_ytick) {
             ty = (i - miny) * ymult;
 
             if (dy < 5) {
@@ -265,11 +265,11 @@ void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
             h = top + height - ty;
 
-            if (h < top) { continue; }
+            if (h < top-0.002) { continue; }
 
             w.renderText(fd, left + width - shorttick*2 - x, (h + (y / 2.0)), 0, m_text_color, defaultfont);
 
-            ticks.append(QLine(left + width - shorttick, h, left + width, h));
+            ticks.append(QLineF(left + width - shorttick, h, left + width, h));
 
             double z = (min_ytick / 4) * ymult;
             double g = h;
@@ -277,12 +277,12 @@ void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
             for (int i = 0; i < 3; i++) {
                 g += z;
 
-                if (g > top + height) { break; }
+                if (g > top + height + 0.002) { break; }
 
-                ticks.append(QLine(left + width - shorttick/2, g, left + width, g));
+                ticks.append(QLineF(left + width - shorttick/2, g, left + width, g));
             }
         }
-        painter.setPen(m_line_color);
+        painter.setPen(Qt::black);
         painter.drawLines(ticks);
         w.graphView()->lines_drawn_this_frame += ticks.size();