diff --git a/src/components/colorbar/draw.js b/src/components/colorbar/draw.js
index 7053a215d2b..b31de8e1b58 100644
--- a/src/components/colorbar/draw.js
+++ b/src/components/colorbar/draw.js
@@ -169,6 +169,7 @@ module.exports = function draw(gd, id) {
                 ticksuffix: opts.ticksuffix,
                 title: opts.title,
                 titlefont: opts.titlefont,
+                showline: true,
                 anchor: 'free',
                 position: 1
             },
diff --git a/src/constants/alignment.js b/src/constants/alignment.js
index 789f5eee175..1ed61b55ce1 100644
--- a/src/constants/alignment.js
+++ b/src/constants/alignment.js
@@ -30,5 +30,13 @@ module.exports = {
         top: 0
     },
     // multiple of fontSize to get the vertical offset between lines
-    LINE_SPACING: 1.3
+    LINE_SPACING: 1.3,
+
+    // multiple of fontSize to shift from the baseline to the midline
+    // (to use when we don't calculate this shift from Drawing.bBox)
+    // To be precise this should be half the cap height (capital letter)
+    // of the font, and according to wikipedia:
+    //   an "average" font might have a cap height of 70% of the em
+    // https://en.wikipedia.org/wiki/Em_(typography)#History
+    MID_SHIFT: 0.35
 };
diff --git a/src/plot_api/subroutines.js b/src/plot_api/subroutines.js
index 967266dbaa3..4e907028c32 100644
--- a/src/plot_api/subroutines.js
+++ b/src/plot_api/subroutines.js
@@ -42,10 +42,16 @@ function overlappingDomain(xDomain, yDomain, domains) {
 }
 
 exports.lsInner = function(gd) {
-    var fullLayout = gd._fullLayout,
-        gs = fullLayout._size,
-        axList = Plotly.Axes.list(gd),
-        i;
+    var fullLayout = gd._fullLayout;
+    var gs = fullLayout._size;
+    var pad = gs.p;
+    var axList = Plotly.Axes.list(gd);
+
+    // _has('cartesian') means SVG specifically, not GL2D - but GL2D
+    // can still get here because it makes some of the SVG structure
+    // for shared features like selections.
+    var hasSVGCartesian = fullLayout._has('cartesian');
+    var i;
 
     // clear axis line positions, to be set in the subplot loop below
     for(i = 0; i < axList.length; i++) axList[i]._linepositions = {};
@@ -80,11 +86,9 @@ exports.lsInner = function(gd) {
             return;
         }
 
-        var xa = Plotly.Axes.getFromId(gd, subplot, 'x'),
-            ya = Plotly.Axes.getFromId(gd, subplot, 'y'),
-            xDomain = xa.domain,
-            yDomain = ya.domain,
-            plotgroupBgData = [];
+        var xDomain = plotinfo.xaxis.domain;
+        var yDomain = plotinfo.yaxis.domain;
+        var plotgroupBgData = [];
 
         if(overlappingDomain(xDomain, yDomain, lowerDomains)) {
             plotgroupBgData = [0];
@@ -125,22 +129,21 @@ exports.lsInner = function(gd) {
         fullLayout._plots[subplot].bg = d3.select(this);
     });
 
-    var freefinished = [];
+    var freeFinished = {};
     subplotSelection.each(function(subplot) {
         var plotinfo = fullLayout._plots[subplot];
-
-        var xa = Plotly.Axes.getFromId(gd, subplot, 'x'),
-            ya = Plotly.Axes.getFromId(gd, subplot, 'y');
+        var xa = plotinfo.xaxis;
+        var ya = plotinfo.yaxis;
 
         // reset scale in case the margins have changed
         xa.setScale();
         ya.setScale();
 
-        if(plotinfo.bg && fullLayout._has('cartesian')) {
+        if(plotinfo.bg && hasSVGCartesian) {
             plotinfo.bg
                 .call(Drawing.setRect,
-                    xa._offset - gs.p, ya._offset - gs.p,
-                    xa._length + 2 * gs.p, ya._length + 2 * gs.p)
+                    xa._offset - pad, ya._offset - pad,
+                    xa._length + 2 * pad, ya._length + 2 * pad)
                 .call(Color.fill, fullLayout.plot_bgcolor)
                 .style('stroke-width', 0);
         }
@@ -165,7 +168,7 @@ exports.lsInner = function(gd) {
                 'height': ya._length
             });
 
-        plotinfo.plot.call(Drawing.setTranslate, xa._offset, ya._offset);
+        Drawing.setTranslate(plotinfo.plot, xa._offset, ya._offset);
 
         var plotClipId;
         var layerClipId;
@@ -191,126 +194,153 @@ exports.lsInner = function(gd) {
         // to DRY up Drawing.setClipUrl calls downstream
         plotinfo.layerClipId = layerClipId;
 
-        var xlw = Drawing.crispRound(gd, xa.linewidth, 1),
-            ylw = Drawing.crispRound(gd, ya.linewidth, 1),
-            xp = gs.p + ylw,
-            xpathPrefix = 'M' + (-xp) + ',',
-            xpathSuffix = 'h' + (xa._length + 2 * xp),
-            showfreex = xa.anchor === 'free' &&
-                freefinished.indexOf(xa._id) === -1,
-            freeposx = gs.h * (1 - (xa.position||0)) + ((xlw / 2) % 1),
-            showbottom =
-                (xa.anchor === ya._id && (xa.mirror || xa.side !== 'top')) ||
-                xa.mirror === 'all' || xa.mirror === 'allticks' ||
-                (xa.mirrors && xa.mirrors[ya._id + 'bottom']),
-            bottompos = ya._length + gs.p + xlw / 2,
-            showtop =
-                (xa.anchor === ya._id && (xa.mirror || xa.side === 'top')) ||
-                xa.mirror === 'all' || xa.mirror === 'allticks' ||
-                (xa.mirrors && xa.mirrors[ya._id + 'top']),
-            toppos = -gs.p - xlw / 2,
-
-            // shorten y axis lines so they don't overlap x axis lines
-            yp = gs.p,
-            // except where there's no x line
-            // TODO: this gets more complicated with multiple x and y axes
-            ypbottom = showbottom ? 0 : xlw,
-            yptop = showtop ? 0 : xlw,
-            ypathSuffix = ',' + (-yp - yptop) +
-                'v' + (ya._length + 2 * yp + yptop + ypbottom),
-            showfreey = ya.anchor === 'free' &&
-                freefinished.indexOf(ya._id) === -1,
-            freeposy = gs.w * (ya.position||0) + ((ylw / 2) % 1),
-            showleft =
-                (ya.anchor === xa._id && (ya.mirror || ya.side !== 'right')) ||
-                ya.mirror === 'all' || ya.mirror === 'allticks' ||
-                (ya.mirrors && ya.mirrors[xa._id + 'left']),
-            leftpos = -gs.p - ylw / 2,
-            showright =
-                (ya.anchor === xa._id && (ya.mirror || ya.side === 'right')) ||
-                ya.mirror === 'all' || ya.mirror === 'allticks' ||
-                (ya.mirrors && ya.mirrors[xa._id + 'right']),
-            rightpos = xa._length + gs.p + ylw / 2;
+        var xIsFree = !xa._anchorAxis;
+        var showFreeX = xIsFree && !freeFinished[xa._id];
+        var showBottom = shouldShowLine(xa, ya, 'bottom');
+        var showTop = shouldShowLine(xa, ya, 'top');
+
+        var yIsFree = !ya._anchorAxis;
+        var showFreeY = yIsFree && !freeFinished[ya._id];
+        var showLeft = shouldShowLine(ya, xa, 'left');
+        var showRight = shouldShowLine(ya, xa, 'right');
+
+        var xlw = Drawing.crispRound(gd, xa.linewidth, 1);
+        var ylw = Drawing.crispRound(gd, ya.linewidth, 1);
+
+        /*
+         * x lines get longer where they meet y lines, to make a crisp corner.
+         * The x lines get the padding (margin.pad) plus the y line width to
+         * fill up the corner nicely. Free x lines are excluded - they always
+         * span exactly the data area of the plot
+         *
+         *  | XXXXX
+         *  | XXXXX
+         *  |
+         *  +------
+         *     x1
+         *    -----
+         *     x2
+         */
+        var leftYLineWidth = findCounterAxisLineWidth(gd, xa, ylw, showLeft, 'left', axList);
+        var xLinesXLeft = (!xIsFree && leftYLineWidth) ?
+            (-pad - leftYLineWidth) : 0;
+        var rightYLineWidth = findCounterAxisLineWidth(gd, xa, ylw, showRight, 'right', axList);
+        var xLinesXRight = xa._length + ((!xIsFree && rightYLineWidth) ?
+            (pad + rightYLineWidth) : 0);
+        var xLinesYFree = gs.h * (1 - (xa.position || 0)) + ((xlw / 2) % 1);
+        var xLinesYBottom = ya._length + pad + xlw / 2;
+        var xLinesYTop = -pad - xlw / 2;
+
+        /*
+         * y lines that meet x axes get longer only by margin.pad, because
+         * the x axes fill in the corner space. Free y axes, like free x axes,
+         * always span exactly the data area of the plot
+         *
+         *   |   | XXXX
+         * y2| y1| XXXX
+         *   |   | XXXX
+         *       |
+         *       +-----
+         */
+        var connectYBottom = !yIsFree && findCounterAxisLineWidth(
+                gd, ya, xlw, showBottom, 'bottom', axList);
+        var yLinesYBottom = ya._length + (connectYBottom ? pad : 0);
+        var connectYTop = !yIsFree && findCounterAxisLineWidth(
+                gd, ya, xlw, showTop, 'top', axList);
+        var yLinesYTop = connectYTop ? -pad : 0;
+        var yLinesXFree = gs.w * (ya.position || 0) + ((ylw / 2) % 1);
+        var yLinesXLeft = -pad - ylw / 2;
+        var yLinesXRight = xa._length + pad + ylw / 2;
+
+        function xLinePath(y, showThis) {
+            if(!showThis) return '';
+            return 'M' + xLinesXLeft + ',' + y + 'H' + xLinesXRight;
+        }
+
+        function yLinePath(x, showThis) {
+            if(!showThis) return '';
+            return 'M' + x + ',' + yLinesYTop + 'V' + yLinesYBottom;
+        }
 
         // save axis line positions for ticks, draggers, etc to reference
         // each subplot gets an entry:
         //    [left or bottom, right or top, free, main]
         // main is the position at which to draw labels and draggers, if any
         xa._linepositions[subplot] = [
-            showbottom ? bottompos : undefined,
-            showtop ? toppos : undefined,
-            showfreex ? freeposx : undefined
+            showBottom ? xLinesYBottom : undefined,
+            showTop ? xLinesYTop : undefined,
+            showFreeX ? xLinesYFree : undefined
         ];
-        if(xa.anchor === ya._id) {
+        if(xa._anchorAxis === ya) {
             xa._linepositions[subplot][3] = xa.side === 'top' ?
-                toppos : bottompos;
+                xLinesYTop : xLinesYBottom;
         }
-        else if(showfreex) {
-            xa._linepositions[subplot][3] = freeposx;
+        else if(showFreeX) {
+            xa._linepositions[subplot][3] = xLinesYFree;
         }
 
         ya._linepositions[subplot] = [
-            showleft ? leftpos : undefined,
-            showright ? rightpos : undefined,
-            showfreey ? freeposy : undefined
+            showLeft ? yLinesXLeft : undefined,
+            showRight ? yLinesXRight : undefined,
+            showFreeY ? yLinesXFree : undefined
         ];
-        if(ya.anchor === xa._id) {
+        if(ya._anchorAxis === xa) {
             ya._linepositions[subplot][3] = ya.side === 'right' ?
-                rightpos : leftpos;
+                yLinesXRight : yLinesXLeft;
         }
-        else if(showfreey) {
-            ya._linepositions[subplot][3] = freeposy;
+        else if(showFreeY) {
+            ya._linepositions[subplot][3] = yLinesXFree;
         }
 
         // translate all the extra stuff to have the
         // same origin as the plot area or axes
-        var origin = 'translate(' + xa._offset + ',' + ya._offset + ')',
-            originx = origin,
-            originy = origin;
-        if(showfreex) {
-            originx = 'translate(' + xa._offset + ',' + gs.t + ')';
-            toppos += ya._offset - gs.t;
-            bottompos += ya._offset - gs.t;
+        var origin = 'translate(' + xa._offset + ',' + ya._offset + ')';
+        var originX = origin;
+        var originY = origin;
+        if(showFreeX) {
+            originX = 'translate(' + xa._offset + ',' + gs.t + ')';
+            xLinesYTop += ya._offset - gs.t;
+            xLinesYBottom += ya._offset - gs.t;
         }
-        if(showfreey) {
-            originy = 'translate(' + gs.l + ',' + ya._offset + ')';
-            leftpos += xa._offset - gs.l;
-            rightpos += xa._offset - gs.l;
+        if(showFreeY) {
+            originY = 'translate(' + gs.l + ',' + ya._offset + ')';
+            yLinesXLeft += xa._offset - gs.l;
+            yLinesXRight += xa._offset - gs.l;
         }
 
-        if(fullLayout._has('cartesian')) {
+        if(hasSVGCartesian) {
             plotinfo.xlines
-                .attr('transform', originx)
+                .attr('transform', originX)
                 .attr('d', (
-                    (showbottom ? (xpathPrefix + bottompos + xpathSuffix) : '') +
-                    (showtop ? (xpathPrefix + toppos + xpathSuffix) : '') +
-                    (showfreex ? (xpathPrefix + freeposx + xpathSuffix) : '')) ||
+                    xLinePath(xLinesYBottom, showBottom) +
+                    xLinePath(xLinesYTop, showTop) +
+                    xLinePath(xLinesYFree, showFreeX)) ||
                     // so it doesn't barf with no lines shown
                     'M0,0')
                 .style('stroke-width', xlw + 'px')
                 .call(Color.stroke, xa.showline ?
                     xa.linecolor : 'rgba(0,0,0,0)');
             plotinfo.ylines
-                .attr('transform', originy)
+                .attr('transform', originY)
                 .attr('d', (
-                    (showleft ? ('M' + leftpos + ypathSuffix) : '') +
-                    (showright ? ('M' + rightpos + ypathSuffix) : '') +
-                    (showfreey ? ('M' + freeposy + ypathSuffix) : '')) ||
+                    yLinePath(yLinesXLeft, showLeft) +
+                    yLinePath(yLinesXRight, showRight) +
+                    yLinePath(yLinesXFree, showFreeY)) ||
                     'M0,0')
-                .attr('stroke-width', ylw + 'px')
+                .style('stroke-width', ylw + 'px')
                 .call(Color.stroke, ya.showline ?
                     ya.linecolor : 'rgba(0,0,0,0)');
         }
 
-        plotinfo.xaxislayer.attr('transform', originx);
-        plotinfo.yaxislayer.attr('transform', originy);
+        plotinfo.xaxislayer.attr('transform', originX);
+        plotinfo.yaxislayer.attr('transform', originY);
         plotinfo.gridlayer.attr('transform', origin);
         plotinfo.zerolinelayer.attr('transform', origin);
         plotinfo.draglayer.attr('transform', origin);
 
         // mark free axes as displayed, so we don't draw them again
-        if(showfreex) { freefinished.push(xa._id); }
-        if(showfreey) { freefinished.push(ya._id); }
+        if(showFreeX) freeFinished[xa._id] = 1;
+        if(showFreeY) freeFinished[ya._id] = 1;
     });
 
     Plotly.Axes.makeClipPaths(gd);
@@ -320,6 +350,65 @@ exports.lsInner = function(gd) {
     return gd._promises.length && Promise.all(gd._promises);
 };
 
+function shouldShowLine(ax, counterAx, side) {
+    return (ax._anchorAxis === counterAx && (ax.mirror || ax.side === side)) ||
+        ax.mirror === 'all' || ax.mirror === 'allticks' ||
+        (ax.mirrors && ax.mirrors[counterAx._id + side]);
+}
+
+function findCounterAxes(gd, ax, axList) {
+    var counterAxes = [];
+    var anchorAx = ax._anchorAxis;
+    if(anchorAx) {
+        var counterMain = anchorAx._mainAxis;
+        if(counterAxes.indexOf(counterMain) === -1) {
+            counterAxes.push(counterMain);
+            for(var i = 0; i < axList.length; i++) {
+                if(axList[i].overlaying === counterMain._id &&
+                    counterAxes.indexOf(axList[i]) === -1
+                ) {
+                    counterAxes.push(axList[i]);
+                }
+            }
+        }
+    }
+    return counterAxes;
+}
+
+function findLineWidth(gd, axes, side) {
+    for(var i = 0; i < axes.length; i++) {
+        var ax = axes[i];
+        var anchorAx = ax._anchorAxis;
+        if(anchorAx && shouldShowLine(ax, anchorAx, side)) {
+            return Drawing.crispRound(gd, ax.linewidth);
+        }
+    }
+}
+
+function findCounterAxisLineWidth(gd, ax, subplotCounterLineWidth,
+        subplotCounterIsShown, side, axList) {
+    if(subplotCounterIsShown) return subplotCounterLineWidth;
+
+    var i;
+
+    // find all counteraxes for this one, then of these, find the
+    // first one that has a visible line on this side
+    var mainAxis = ax._mainAxis;
+    var counterAxes = findCounterAxes(gd, mainAxis, axList);
+
+    var lineWidth = findLineWidth(gd, counterAxes, side);
+    if(lineWidth) return lineWidth;
+
+    for(i = 0; i < axList.length; i++) {
+        if(axList[i].overlaying === mainAxis._id) {
+            counterAxes = findCounterAxes(gd, axList[i], axList);
+            lineWidth = findLineWidth(gd, counterAxes, side);
+            if(lineWidth) return lineWidth;
+        }
+    }
+    return 0;
+}
+
 exports.drawMainTitle = function(gd) {
     var fullLayout = gd._fullLayout;
 
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
index 56b911d2870..7ca242fb687 100644
--- a/src/plots/cartesian/axes.js
+++ b/src/plots/cartesian/axes.js
@@ -28,6 +28,8 @@ var ONEHOUR = constants.ONEHOUR;
 var ONEMIN = constants.ONEMIN;
 var ONESEC = constants.ONESEC;
 
+var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
+
 var axes = module.exports = {};
 
 axes.layoutAttributes = require('./layout_attributes');
@@ -1684,8 +1686,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
         gcls = axid + 'grid',
         zcls = axid + 'zl',
         pad = (ax.linewidth || 1) / 2,
-        labelStandoff =
-            (ax.ticks === 'outside' ? ax.ticklen : 1) + (ax.linewidth || 0),
+        labelStandoff = (ax.ticks === 'outside' ? ax.ticklen : 0),
         labelShift = 0,
         gridWidth = Drawing.crispRound(gd, ax.gridwidth, 1),
         zeroLineWidth = Drawing.crispRound(gd, ax.zerolinewidth, gridWidth),
@@ -1695,10 +1696,14 @@ axes.doTicks = function(gd, axid, skipTitle) {
 
     if(ax._counterangle && ax.ticks === 'outside') {
         var caRad = ax._counterangle * Math.PI / 180;
-        labelStandoff = ax.ticklen * Math.cos(caRad) + (ax.linewidth || 0);
+        labelStandoff = ax.ticklen * Math.cos(caRad) + 1;
         labelShift = ax.ticklen * Math.sin(caRad);
     }
 
+    if(ax.ticks === 'outside' || ax.showline) {
+        labelStandoff += 0.2 * ax.tickfont.size;
+    }
+
     // positioning arguments for x vs y axes
     if(axLetter === 'x') {
         sides = ['bottom', 'top'];
@@ -1781,7 +1786,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
             labelpos0 = position + (labelStandoff + pad) * flipit;
             labely = function(d) {
                 return d.dy + labelpos0 + d.fontSize *
-                    ((axside === 'bottom') ? 1 : -0.5);
+                    ((axside === 'bottom') ? 1 : -0.2);
             };
             labelanchor = function(angle) {
                 if(!isNumeric(angle) || angle === 0 || angle === 180) {
@@ -1792,7 +1797,9 @@ axes.doTicks = function(gd, axid, skipTitle) {
         }
         else {
             flipit = (axside === 'right') ? 1 : -1;
-            labely = function(d) { return d.dy + d.fontSize / 2 - labelShift * flipit; };
+            labely = function(d) {
+                return d.dy + d.fontSize * MID_SHIFT - labelShift * flipit;
+            };
             labelx = function(d) {
                 return d.dx + position + (labelStandoff + pad +
                     ((Math.abs(ax.tickangle) === 90) ? d.fontSize / 2 : 0)) * flipit;
@@ -2019,16 +2026,23 @@ axes.doTicks = function(gd, axid, skipTitle) {
             avoid.offsetTop = translation.y;
         }
 
+        var titleStandoff = 10 + fontSize * offsetBase +
+            (ax.linewidth ? ax.linewidth - 1 : 0);
+
         if(axLetter === 'x') {
             counterAxis = (ax.anchor === 'free') ?
                 {_offset: gs.t + (1 - (ax.position || 0)) * gs.h, _length: 0} :
                 axisIds.getFromId(gd, ax.anchor);
 
             x = ax._offset + ax._length / 2;
-            y = counterAxis._offset + ((ax.side === 'top') ?
-                -10 - fontSize * (offsetBase + (ax.showticklabels ? 1 : 0)) :
-                counterAxis._length + 10 +
-                    fontSize * (offsetBase + (ax.showticklabels ? 1.5 : 0.5)));
+            if(ax.side === 'top') {
+                y = -titleStandoff - fontSize * (ax.showticklabels ? 1 : 0);
+            }
+            else {
+                y = counterAxis._length + titleStandoff +
+                    fontSize * (ax.showticklabels ? 1.5 : 0.5);
+            }
+            y += counterAxis._offset;
 
             if(ax.rangeslider && ax.rangeslider.visible && ax._boundingBox) {
                 y += (fullLayout.height - fullLayout.margin.b - fullLayout.margin.t) *
@@ -2043,10 +2057,14 @@ axes.doTicks = function(gd, axid, skipTitle) {
                 axisIds.getFromId(gd, ax.anchor);
 
             y = ax._offset + ax._length / 2;
-            x = counterAxis._offset + ((ax.side === 'right') ?
-                counterAxis._length + 10 +
-                    fontSize * (offsetBase + (ax.showticklabels ? 1 : 0.5)) :
-                -10 - fontSize * (offsetBase + (ax.showticklabels ? 0.5 : 0)));
+            if(ax.side === 'right') {
+                x = counterAxis._length + titleStandoff +
+                    fontSize * (ax.showticklabels ? 1 : 0.5);
+            }
+            else {
+                x = -titleStandoff - fontSize * (ax.showticklabels ? 0.5 : 0);
+            }
+            x += counterAxis._offset;
 
             transform = {rotate: '-90', offset: 0};
             if(!avoid.side) avoid.side = 'left';
diff --git a/src/plots/cartesian/index.js b/src/plots/cartesian/index.js
index e2e3af6dc9f..3ca43838d02 100644
--- a/src/plots/cartesian/index.js
+++ b/src/plots/cartesian/index.js
@@ -242,40 +242,16 @@ function makeSubplotData(gd) {
         var subplot = subplots[i],
             plotinfo = fullLayout._plots[subplot];
 
-        var xa = plotinfo.xaxis,
-            ya = plotinfo.yaxis;
-
-        // is this subplot overlaid on another?
-        // ax.overlaying is the id of another axis of the same
-        // dimension that this one overlays to be an overlaid subplot,
-        // the main plot must exist make sure we're not trying to
-        // overlay on an axis that's already overlaying another
-        var xa2 = axisIds.getFromId(gd, xa.overlaying) || xa;
-        if(xa2 !== xa && xa2.overlaying) {
-            xa2 = xa;
-            xa.overlaying = false;
-        }
-
-        var ya2 = axisIds.getFromId(gd, ya.overlaying) || ya;
-        if(ya2 !== ya && ya2.overlaying) {
-            ya2 = ya;
-            ya.overlaying = false;
-        }
+        var xa = plotinfo.xaxis;
+        var ya = plotinfo.yaxis;
+        var xa2 = xa._mainAxis;
+        var ya2 = ya._mainAxis;
 
         var mainplot = xa2._id + ya2._id;
         if(mainplot !== subplot && subplots.indexOf(mainplot) !== -1) {
             plotinfo.mainplot = mainplot;
             plotinfo.mainplotinfo = fullLayout._plots[mainplot];
             overlays.push(subplot);
-
-            // for now force overlays to overlay completely... so they
-            // can drag together correctly and share backgrounds.
-            // Later perhaps we make separate axis domain and
-            // tick/line domain or something, so they can still share
-            // the (possibly larger) dragger and background but don't
-            // have to both be drawn over that whole domain
-            xa.domain = xa2.domain.slice();
-            ya.domain = ya2.domain.slice();
         }
         else {
             subplotData.push(subplot);
diff --git a/src/plots/plots.js b/src/plots/plots.js
index bb4e59fb6b8..17b22b4f230 100644
--- a/src/plots/plots.js
+++ b/src/plots/plots.js
@@ -641,7 +641,9 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
 
     var ids = Plotly.Axes.getSubplots(mockGd);
 
-    for(var i = 0; i < ids.length; i++) {
+    var i;
+
+    for(i = 0; i < ids.length; i++) {
         var id = ids[i];
         var oldSubplot = oldSubplots[id];
         var xaxis = Plotly.Axes.getFromId(mockGd, id, 'x');
@@ -691,6 +693,39 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
             }
         }
     }
+
+    // while we're at it, link overlaying axes to their main axes and
+    // anchored axes to the axes they're anchored to
+    var axList = Plotly.Axes.list(mockGd, null, true);
+    for(i = 0; i < axList.length; i++) {
+        var ax = axList[i];
+        var mainAx = null;
+
+        if(ax.overlaying) {
+            mainAx = Plotly.Axes.getFromId(mockGd, ax.overlaying);
+
+            // you cannot overlay an axis that's already overlaying another
+            if(mainAx && mainAx.overlaying) {
+                ax.overlaying = false;
+                mainAx = null;
+            }
+        }
+        ax._mainAxis = mainAx || ax;
+
+        /*
+         * For now force overlays to overlay completely... so they
+         * can drag together correctly and share backgrounds.
+         * Later perhaps we make separate axis domain and
+         * tick/line domain or something, so they can still share
+         * the (possibly larger) dragger and background but don't
+         * have to both be drawn over that whole domain
+         */
+        if(mainAx) ax.domain = mainAx.domain.slice();
+
+        ax._anchorAxis = ax.anchor === 'free' ?
+            null :
+            Plotly.Axes.getFromId(mockGd, ax.anchor);
+    }
 };
 
 // This function clears any trace attributes with valType: color and
diff --git a/src/plots/polar/micropolar.js b/src/plots/polar/micropolar.js
index 208da6995b5..d13f5438065 100644
--- a/src/plots/polar/micropolar.js
+++ b/src/plots/polar/micropolar.js
@@ -9,6 +9,7 @@
 var d3 = require('d3');
 var Lib = require('../../lib');
 var extendDeepAll = Lib.extendDeepAll;
+var MID_SHIFT = require('../../constants/alignment').MID_SHIFT;
 
 var µ = module.exports = { version: '0.2.2' };
 
@@ -295,7 +296,7 @@ var µ = module.exports = { version: '0.2.2' };
             angularAxisEnter.append('text').classed('axis-text', true).style(fontStyle);
             var ticksText = angularAxis.select('text.axis-text').attr({
                 x: radius + axisConfig.labelOffset,
-                dy: '.35em',
+                dy: MID_SHIFT + 'em',
                 transform: function(d, i) {
                     var angle = currentAngle(d, i);
                     var rad = radius + axisConfig.labelOffset;
diff --git a/test/image/baselines/0.png b/test/image/baselines/0.png
index 5a839d4ac52..9d6c91ac31a 100644
Binary files a/test/image/baselines/0.png and b/test/image/baselines/0.png differ
diff --git a/test/image/baselines/1.png b/test/image/baselines/1.png
index e6fb5157b2a..eb01e3dfafc 100644
Binary files a/test/image/baselines/1.png and b/test/image/baselines/1.png differ
diff --git a/test/image/baselines/10.png b/test/image/baselines/10.png
index 7ad61fc3534..475b193bcb5 100644
Binary files a/test/image/baselines/10.png and b/test/image/baselines/10.png differ
diff --git a/test/image/baselines/11.png b/test/image/baselines/11.png
index 998509dd8d5..0b5e7486d53 100644
Binary files a/test/image/baselines/11.png and b/test/image/baselines/11.png differ
diff --git a/test/image/baselines/12.png b/test/image/baselines/12.png
index 48dbbde6e98..4b81dee9a6c 100644
Binary files a/test/image/baselines/12.png and b/test/image/baselines/12.png differ
diff --git a/test/image/baselines/13.png b/test/image/baselines/13.png
index 535a8896af3..2d1b1652ef5 100644
Binary files a/test/image/baselines/13.png and b/test/image/baselines/13.png differ
diff --git a/test/image/baselines/14.png b/test/image/baselines/14.png
index 298dda9f858..bcea17520b0 100644
Binary files a/test/image/baselines/14.png and b/test/image/baselines/14.png differ
diff --git a/test/image/baselines/15.png b/test/image/baselines/15.png
index d3e08275fce..cb368944185 100644
Binary files a/test/image/baselines/15.png and b/test/image/baselines/15.png differ
diff --git a/test/image/baselines/16.png b/test/image/baselines/16.png
index edce238d560..cfa602db6b7 100644
Binary files a/test/image/baselines/16.png and b/test/image/baselines/16.png differ
diff --git a/test/image/baselines/17.png b/test/image/baselines/17.png
index 953ec288684..e9292065669 100644
Binary files a/test/image/baselines/17.png and b/test/image/baselines/17.png differ
diff --git a/test/image/baselines/18.png b/test/image/baselines/18.png
index fa9a76433a5..478c7f21823 100644
Binary files a/test/image/baselines/18.png and b/test/image/baselines/18.png differ
diff --git a/test/image/baselines/19.png b/test/image/baselines/19.png
index 3d0619e7d0c..83bb484d031 100644
Binary files a/test/image/baselines/19.png and b/test/image/baselines/19.png differ
diff --git a/test/image/baselines/20.png b/test/image/baselines/20.png
index 9a9823b0a5c..abfccd22f1b 100644
Binary files a/test/image/baselines/20.png and b/test/image/baselines/20.png differ
diff --git a/test/image/baselines/21.png b/test/image/baselines/21.png
index 887f6319bfa..098370c0c47 100644
Binary files a/test/image/baselines/21.png and b/test/image/baselines/21.png differ
diff --git a/test/image/baselines/22.png b/test/image/baselines/22.png
index 706636c7ecb..fa84aea1e82 100644
Binary files a/test/image/baselines/22.png and b/test/image/baselines/22.png differ
diff --git a/test/image/baselines/23.png b/test/image/baselines/23.png
index cf24f84cb93..6a4223e6b18 100644
Binary files a/test/image/baselines/23.png and b/test/image/baselines/23.png differ
diff --git a/test/image/baselines/24.png b/test/image/baselines/24.png
index 1609cfe305b..9412925e6e9 100644
Binary files a/test/image/baselines/24.png and b/test/image/baselines/24.png differ
diff --git a/test/image/baselines/25.png b/test/image/baselines/25.png
index 8b594601ba9..5008e9ea872 100644
Binary files a/test/image/baselines/25.png and b/test/image/baselines/25.png differ
diff --git a/test/image/baselines/26.png b/test/image/baselines/26.png
index 24dbeb6bddc..77374918c3f 100644
Binary files a/test/image/baselines/26.png and b/test/image/baselines/26.png differ
diff --git a/test/image/baselines/27.png b/test/image/baselines/27.png
index be45068e67d..5ae3813e461 100644
Binary files a/test/image/baselines/27.png and b/test/image/baselines/27.png differ
diff --git a/test/image/baselines/28.png b/test/image/baselines/28.png
index 81c03a292af..5c6e382b07e 100644
Binary files a/test/image/baselines/28.png and b/test/image/baselines/28.png differ
diff --git a/test/image/baselines/29.png b/test/image/baselines/29.png
index 0faec1aead8..a05d30b307f 100644
Binary files a/test/image/baselines/29.png and b/test/image/baselines/29.png differ
diff --git a/test/image/baselines/2dhistogram_contour_subplots.png b/test/image/baselines/2dhistogram_contour_subplots.png
index ef4a2dbbbcd..61dbea133e2 100644
Binary files a/test/image/baselines/2dhistogram_contour_subplots.png and b/test/image/baselines/2dhistogram_contour_subplots.png differ
diff --git a/test/image/baselines/30.png b/test/image/baselines/30.png
index e55ced25e11..94dda21ced6 100644
Binary files a/test/image/baselines/30.png and b/test/image/baselines/30.png differ
diff --git a/test/image/baselines/31.png b/test/image/baselines/31.png
index 7f73d4b4db0..1b4de09c01c 100644
Binary files a/test/image/baselines/31.png and b/test/image/baselines/31.png differ
diff --git a/test/image/baselines/32.png b/test/image/baselines/32.png
index e5d91547778..4602377412d 100644
Binary files a/test/image/baselines/32.png and b/test/image/baselines/32.png differ
diff --git a/test/image/baselines/4.png b/test/image/baselines/4.png
index e90ad7c9c00..d98ff4cd002 100644
Binary files a/test/image/baselines/4.png and b/test/image/baselines/4.png differ
diff --git a/test/image/baselines/5.png b/test/image/baselines/5.png
index e0538488ab2..6d0396fb097 100644
Binary files a/test/image/baselines/5.png and b/test/image/baselines/5.png differ
diff --git a/test/image/baselines/airfoil.png b/test/image/baselines/airfoil.png
index 5864595e7ab..81c0340bdec 100644
Binary files a/test/image/baselines/airfoil.png and b/test/image/baselines/airfoil.png differ
diff --git a/test/image/baselines/animation.png b/test/image/baselines/animation.png
index 627670db86e..91bda9d9621 100644
Binary files a/test/image/baselines/animation.png and b/test/image/baselines/animation.png differ
diff --git a/test/image/baselines/annotations-autorange.png b/test/image/baselines/annotations-autorange.png
index da920e7ed1c..4ae3404b064 100644
Binary files a/test/image/baselines/annotations-autorange.png and b/test/image/baselines/annotations-autorange.png differ
diff --git a/test/image/baselines/autorange-tozero-rangemode.png b/test/image/baselines/autorange-tozero-rangemode.png
index 7c4d3d477e0..152e96cbff2 100644
Binary files a/test/image/baselines/autorange-tozero-rangemode.png and b/test/image/baselines/autorange-tozero-rangemode.png differ
diff --git a/test/image/baselines/axes-autotype-empty.png b/test/image/baselines/axes-autotype-empty.png
index 55d965bd247..3ab891cb10a 100644
Binary files a/test/image/baselines/axes-autotype-empty.png and b/test/image/baselines/axes-autotype-empty.png differ
diff --git a/test/image/baselines/axes-ticks.png b/test/image/baselines/axes-ticks.png
index ac908438243..d4867a0ffc8 100644
Binary files a/test/image/baselines/axes-ticks.png and b/test/image/baselines/axes-ticks.png differ
diff --git a/test/image/baselines/axes_category_ascending.png b/test/image/baselines/axes_category_ascending.png
index f6252c4594b..f65f8ef73d4 100644
Binary files a/test/image/baselines/axes_category_ascending.png and b/test/image/baselines/axes_category_ascending.png differ
diff --git a/test/image/baselines/axes_category_categoryarray.png b/test/image/baselines/axes_category_categoryarray.png
index 288c3446f8c..105b0baa2a2 100644
Binary files a/test/image/baselines/axes_category_categoryarray.png and b/test/image/baselines/axes_category_categoryarray.png differ
diff --git a/test/image/baselines/axes_category_categoryarray_truncated_tails.png b/test/image/baselines/axes_category_categoryarray_truncated_tails.png
index 9ffed02481c..ef9c917505c 100644
Binary files a/test/image/baselines/axes_category_categoryarray_truncated_tails.png and b/test/image/baselines/axes_category_categoryarray_truncated_tails.png differ
diff --git a/test/image/baselines/axes_category_descending.png b/test/image/baselines/axes_category_descending.png
index 6eb5d95693b..9aaa43edaaa 100644
Binary files a/test/image/baselines/axes_category_descending.png and b/test/image/baselines/axes_category_descending.png differ
diff --git a/test/image/baselines/axes_category_descending_with_gaps.png b/test/image/baselines/axes_category_descending_with_gaps.png
index 6981f01ca0b..191b91b7995 100644
Binary files a/test/image/baselines/axes_category_descending_with_gaps.png and b/test/image/baselines/axes_category_descending_with_gaps.png differ
diff --git a/test/image/baselines/axes_category_null.png b/test/image/baselines/axes_category_null.png
index bc75883b8fc..fccc962bf5c 100644
Binary files a/test/image/baselines/axes_category_null.png and b/test/image/baselines/axes_category_null.png differ
diff --git a/test/image/baselines/axes_enumerated_ticks.png b/test/image/baselines/axes_enumerated_ticks.png
index f6bed5e88b8..5e2dad1405e 100644
Binary files a/test/image/baselines/axes_enumerated_ticks.png and b/test/image/baselines/axes_enumerated_ticks.png differ
diff --git a/test/image/baselines/axes_free_default.png b/test/image/baselines/axes_free_default.png
index ef8afc82482..7b6c66e521b 100644
Binary files a/test/image/baselines/axes_free_default.png and b/test/image/baselines/axes_free_default.png differ
diff --git a/test/image/baselines/axes_labels.png b/test/image/baselines/axes_labels.png
index 58917494cb1..9bb71bed75c 100644
Binary files a/test/image/baselines/axes_labels.png and b/test/image/baselines/axes_labels.png differ
diff --git a/test/image/baselines/axes_lines.png b/test/image/baselines/axes_lines.png
index ac009453593..290d6b57754 100644
Binary files a/test/image/baselines/axes_lines.png and b/test/image/baselines/axes_lines.png differ
diff --git a/test/image/baselines/axes_range_manual.png b/test/image/baselines/axes_range_manual.png
index 60540ad468b..0419301721b 100644
Binary files a/test/image/baselines/axes_range_manual.png and b/test/image/baselines/axes_range_manual.png differ
diff --git a/test/image/baselines/axes_range_mode.png b/test/image/baselines/axes_range_mode.png
index 04d7dab5de3..927bd5e1a57 100644
Binary files a/test/image/baselines/axes_range_mode.png and b/test/image/baselines/axes_range_mode.png differ
diff --git a/test/image/baselines/axes_range_type.png b/test/image/baselines/axes_range_type.png
index af39babcf82..2abd177735a 100644
Binary files a/test/image/baselines/axes_range_type.png and b/test/image/baselines/axes_range_type.png differ
diff --git a/test/image/baselines/axes_reversed.png b/test/image/baselines/axes_reversed.png
index 5f93712d3f8..6c777c6ad60 100644
Binary files a/test/image/baselines/axes_reversed.png and b/test/image/baselines/axes_reversed.png differ
diff --git a/test/image/baselines/axes_scaleanchor.png b/test/image/baselines/axes_scaleanchor.png
index ea4c3118c69..48c55dba35f 100644
Binary files a/test/image/baselines/axes_scaleanchor.png and b/test/image/baselines/axes_scaleanchor.png differ
diff --git a/test/image/baselines/axislabel_separatethousands.png b/test/image/baselines/axislabel_separatethousands.png
index d3af4c99e6d..64e60032333 100644
Binary files a/test/image/baselines/axislabel_separatethousands.png and b/test/image/baselines/axislabel_separatethousands.png differ
diff --git a/test/image/baselines/bar-colorscale-colorbar.png b/test/image/baselines/bar-colorscale-colorbar.png
index eebca727b4f..371fcece1a2 100644
Binary files a/test/image/baselines/bar-colorscale-colorbar.png and b/test/image/baselines/bar-colorscale-colorbar.png differ
diff --git a/test/image/baselines/bar-marker-line-colorscales.png b/test/image/baselines/bar-marker-line-colorscales.png
index 39c1466761a..50b1bc8520f 100644
Binary files a/test/image/baselines/bar-marker-line-colorscales.png and b/test/image/baselines/bar-marker-line-colorscales.png differ
diff --git a/test/image/baselines/bar_and_histogram.png b/test/image/baselines/bar_and_histogram.png
index d5e426b968f..99bd2626b13 100644
Binary files a/test/image/baselines/bar_and_histogram.png and b/test/image/baselines/bar_and_histogram.png differ
diff --git a/test/image/baselines/bar_attrs_group.png b/test/image/baselines/bar_attrs_group.png
index 1b965bb7893..70303cdec40 100644
Binary files a/test/image/baselines/bar_attrs_group.png and b/test/image/baselines/bar_attrs_group.png differ
diff --git a/test/image/baselines/bar_attrs_group_norm.png b/test/image/baselines/bar_attrs_group_norm.png
index 330d6607ce7..2a6af739214 100644
Binary files a/test/image/baselines/bar_attrs_group_norm.png and b/test/image/baselines/bar_attrs_group_norm.png differ
diff --git a/test/image/baselines/bar_attrs_overlay.png b/test/image/baselines/bar_attrs_overlay.png
index 2c0894ab69f..63e845af88a 100644
Binary files a/test/image/baselines/bar_attrs_overlay.png and b/test/image/baselines/bar_attrs_overlay.png differ
diff --git a/test/image/baselines/bar_attrs_relative.png b/test/image/baselines/bar_attrs_relative.png
index a2dee28d1ee..a9406c60670 100644
Binary files a/test/image/baselines/bar_attrs_relative.png and b/test/image/baselines/bar_attrs_relative.png differ
diff --git a/test/image/baselines/bar_bargap0.png b/test/image/baselines/bar_bargap0.png
index dfd5e98821f..cb28738e50c 100644
Binary files a/test/image/baselines/bar_bargap0.png and b/test/image/baselines/bar_bargap0.png differ
diff --git a/test/image/baselines/bar_group_percent.png b/test/image/baselines/bar_group_percent.png
index c0ccc7f9c13..add38a4d52d 100644
Binary files a/test/image/baselines/bar_group_percent.png and b/test/image/baselines/bar_group_percent.png differ
diff --git a/test/image/baselines/bar_line.png b/test/image/baselines/bar_line.png
index 5d922d1ba0a..8d37e62a736 100644
Binary files a/test/image/baselines/bar_line.png and b/test/image/baselines/bar_line.png differ
diff --git a/test/image/baselines/bar_marker_array.png b/test/image/baselines/bar_marker_array.png
index 08d1cec4a7a..747544a2d48 100644
Binary files a/test/image/baselines/bar_marker_array.png and b/test/image/baselines/bar_marker_array.png differ
diff --git a/test/image/baselines/bar_nonnumeric_sizes.png b/test/image/baselines/bar_nonnumeric_sizes.png
index dce1c7b2be0..6f05e329e1e 100644
Binary files a/test/image/baselines/bar_nonnumeric_sizes.png and b/test/image/baselines/bar_nonnumeric_sizes.png differ
diff --git a/test/image/baselines/bar_stack-with-gaps.png b/test/image/baselines/bar_stack-with-gaps.png
index 2d08e07c8db..61540bddb7e 100644
Binary files a/test/image/baselines/bar_stack-with-gaps.png and b/test/image/baselines/bar_stack-with-gaps.png differ
diff --git a/test/image/baselines/bar_stackrelative_negative.png b/test/image/baselines/bar_stackrelative_negative.png
index 68090397c57..add20b5908e 100644
Binary files a/test/image/baselines/bar_stackrelative_negative.png and b/test/image/baselines/bar_stackrelative_negative.png differ
diff --git a/test/image/baselines/bar_stackrelativeto100_negative.png b/test/image/baselines/bar_stackrelativeto100_negative.png
index 7dd1d60bce9..34f97dd0325 100644
Binary files a/test/image/baselines/bar_stackrelativeto100_negative.png and b/test/image/baselines/bar_stackrelativeto100_negative.png differ
diff --git a/test/image/baselines/bar_stackto1.png b/test/image/baselines/bar_stackto1.png
index c4ca8cddfa9..530075b3c60 100644
Binary files a/test/image/baselines/bar_stackto1.png and b/test/image/baselines/bar_stackto1.png differ
diff --git a/test/image/baselines/bar_stackto100_negative.png b/test/image/baselines/bar_stackto100_negative.png
index 17fb79bd290..a249725ac64 100644
Binary files a/test/image/baselines/bar_stackto100_negative.png and b/test/image/baselines/bar_stackto100_negative.png differ
diff --git a/test/image/baselines/basic_area.png b/test/image/baselines/basic_area.png
index 3cc95b67fbb..f1f3a909e47 100644
Binary files a/test/image/baselines/basic_area.png and b/test/image/baselines/basic_area.png differ
diff --git a/test/image/baselines/basic_bar.png b/test/image/baselines/basic_bar.png
index 3f35ac2353f..f73d9bd7a35 100644
Binary files a/test/image/baselines/basic_bar.png and b/test/image/baselines/basic_bar.png differ
diff --git a/test/image/baselines/basic_error_bar.png b/test/image/baselines/basic_error_bar.png
index 8af2d64e645..9fdd47203ed 100644
Binary files a/test/image/baselines/basic_error_bar.png and b/test/image/baselines/basic_error_bar.png differ
diff --git a/test/image/baselines/basic_heatmap.png b/test/image/baselines/basic_heatmap.png
index 1c60ab8cd1f..6715d951437 100644
Binary files a/test/image/baselines/basic_heatmap.png and b/test/image/baselines/basic_heatmap.png differ
diff --git a/test/image/baselines/basic_line.png b/test/image/baselines/basic_line.png
index 70c712c3b3e..fa4ffb0f9bb 100644
Binary files a/test/image/baselines/basic_line.png and b/test/image/baselines/basic_line.png differ
diff --git a/test/image/baselines/benchmarks.png b/test/image/baselines/benchmarks.png
index 9a5b1b825ea..c04e854f6f0 100644
Binary files a/test/image/baselines/benchmarks.png and b/test/image/baselines/benchmarks.png differ
diff --git a/test/image/baselines/binding.png b/test/image/baselines/binding.png
index 29be16f1ce0..e527da8f9d6 100644
Binary files a/test/image/baselines/binding.png and b/test/image/baselines/binding.png differ
diff --git a/test/image/baselines/blackbody_heatmap.png b/test/image/baselines/blackbody_heatmap.png
index 887d541ed2a..956f431f8a0 100644
Binary files a/test/image/baselines/blackbody_heatmap.png and b/test/image/baselines/blackbody_heatmap.png differ
diff --git a/test/image/baselines/bluered_heatmap.png b/test/image/baselines/bluered_heatmap.png
index 3e099a5ea05..3b3eb50ec02 100644
Binary files a/test/image/baselines/bluered_heatmap.png and b/test/image/baselines/bluered_heatmap.png differ
diff --git a/test/image/baselines/box_grouped.png b/test/image/baselines/box_grouped.png
index 291bc99a09a..fc7cf632651 100644
Binary files a/test/image/baselines/box_grouped.png and b/test/image/baselines/box_grouped.png differ
diff --git a/test/image/baselines/box_grouped_horz.png b/test/image/baselines/box_grouped_horz.png
index b2f67768d6b..cac2a0b8934 100644
Binary files a/test/image/baselines/box_grouped_horz.png and b/test/image/baselines/box_grouped_horz.png differ
diff --git a/test/image/baselines/box_plot_jitter.png b/test/image/baselines/box_plot_jitter.png
index 7c533d7c983..e292fc302f6 100644
Binary files a/test/image/baselines/box_plot_jitter.png and b/test/image/baselines/box_plot_jitter.png differ
diff --git a/test/image/baselines/box_plot_jitter_edge_cases.png b/test/image/baselines/box_plot_jitter_edge_cases.png
index 1853a20a16c..b1fd5f70202 100644
Binary files a/test/image/baselines/box_plot_jitter_edge_cases.png and b/test/image/baselines/box_plot_jitter_edge_cases.png differ
diff --git a/test/image/baselines/box_with-empty-1st-trace.png b/test/image/baselines/box_with-empty-1st-trace.png
index 9910ea1ba1f..aaee8d92a53 100644
Binary files a/test/image/baselines/box_with-empty-1st-trace.png and b/test/image/baselines/box_with-empty-1st-trace.png differ
diff --git a/test/image/baselines/boxplots_outliercolordflt.png b/test/image/baselines/boxplots_outliercolordflt.png
index 8c1d85d3d2e..d1955a92101 100644
Binary files a/test/image/baselines/boxplots_outliercolordflt.png and b/test/image/baselines/boxplots_outliercolordflt.png differ
diff --git a/test/image/baselines/boxplots_undefined_vals.png b/test/image/baselines/boxplots_undefined_vals.png
index ea30fffdd91..b08fe661243 100644
Binary files a/test/image/baselines/boxplots_undefined_vals.png and b/test/image/baselines/boxplots_undefined_vals.png differ
diff --git a/test/image/baselines/bubble_markersize0.png b/test/image/baselines/bubble_markersize0.png
index 3423fa0c21d..86f376da04c 100644
Binary files a/test/image/baselines/bubble_markersize0.png and b/test/image/baselines/bubble_markersize0.png differ
diff --git a/test/image/baselines/bubble_nonnumeric-sizes.png b/test/image/baselines/bubble_nonnumeric-sizes.png
index e586fa1fd2c..2b9918aa5a3 100644
Binary files a/test/image/baselines/bubble_nonnumeric-sizes.png and b/test/image/baselines/bubble_nonnumeric-sizes.png differ
diff --git a/test/image/baselines/bubblechart.png b/test/image/baselines/bubblechart.png
index 0a843db7590..e32d0764bf6 100644
Binary files a/test/image/baselines/bubblechart.png and b/test/image/baselines/bubblechart.png differ
diff --git a/test/image/baselines/candlestick_double-y-axis.png b/test/image/baselines/candlestick_double-y-axis.png
index ba345fc65f8..f423ad6fd0f 100644
Binary files a/test/image/baselines/candlestick_double-y-axis.png and b/test/image/baselines/candlestick_double-y-axis.png differ
diff --git a/test/image/baselines/candlestick_rangeslider_thai.png b/test/image/baselines/candlestick_rangeslider_thai.png
index ec2320976eb..9e79776b5bf 100644
Binary files a/test/image/baselines/candlestick_rangeslider_thai.png and b/test/image/baselines/candlestick_rangeslider_thai.png differ
diff --git a/test/image/baselines/carpet_axis.png b/test/image/baselines/carpet_axis.png
index e584931c740..33d691330b9 100644
Binary files a/test/image/baselines/carpet_axis.png and b/test/image/baselines/carpet_axis.png differ
diff --git a/test/image/baselines/category-autorange.png b/test/image/baselines/category-autorange.png
index 7fa82b03d8c..078844e735e 100644
Binary files a/test/image/baselines/category-autorange.png and b/test/image/baselines/category-autorange.png differ
diff --git a/test/image/baselines/category_dtick_3.png b/test/image/baselines/category_dtick_3.png
index 1df0879cdd3..7581a6c2dc6 100644
Binary files a/test/image/baselines/category_dtick_3.png and b/test/image/baselines/category_dtick_3.png differ
diff --git a/test/image/baselines/cheater.png b/test/image/baselines/cheater.png
index 488316c98fd..de015df4b0d 100644
Binary files a/test/image/baselines/cheater.png and b/test/image/baselines/cheater.png differ
diff --git a/test/image/baselines/cheater_constraint_greater_than.png b/test/image/baselines/cheater_constraint_greater_than.png
index 724d8c5da5c..c35f2d3af9f 100644
Binary files a/test/image/baselines/cheater_constraint_greater_than.png and b/test/image/baselines/cheater_constraint_greater_than.png differ
diff --git a/test/image/baselines/cheater_constraint_greater_than_with_hill.png b/test/image/baselines/cheater_constraint_greater_than_with_hill.png
index e903cbb3e85..426283f854b 100644
Binary files a/test/image/baselines/cheater_constraint_greater_than_with_hill.png and b/test/image/baselines/cheater_constraint_greater_than_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_greater_than_with_valley.png b/test/image/baselines/cheater_constraint_greater_than_with_valley.png
index a0c94afedc3..7197ebbf6d7 100644
Binary files a/test/image/baselines/cheater_constraint_greater_than_with_valley.png and b/test/image/baselines/cheater_constraint_greater_than_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range.png b/test/image/baselines/cheater_constraint_inner_range.png
index 826dd1a08eb..573373e14f2 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range.png and b/test/image/baselines/cheater_constraint_inner_range.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_hi_top.png b/test/image/baselines/cheater_constraint_inner_range_hi_top.png
index 65431e4f8f0..a1f0585bf51 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_hi_top.png and b/test/image/baselines/cheater_constraint_inner_range_hi_top.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_hi_top_with_hill.png b/test/image/baselines/cheater_constraint_inner_range_hi_top_with_hill.png
index d7eb0bcfd47..96da7d662ad 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_hi_top_with_hill.png and b/test/image/baselines/cheater_constraint_inner_range_hi_top_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_hi_top_with_valley.png b/test/image/baselines/cheater_constraint_inner_range_hi_top_with_valley.png
index 1ca6fd6014d..7fae0f999e9 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_hi_top_with_valley.png and b/test/image/baselines/cheater_constraint_inner_range_hi_top_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_lo_top.png b/test/image/baselines/cheater_constraint_inner_range_lo_top.png
index 318dd4c6d14..abca06004c2 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_lo_top.png and b/test/image/baselines/cheater_constraint_inner_range_lo_top.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_lo_top_with_hill.png b/test/image/baselines/cheater_constraint_inner_range_lo_top_with_hill.png
index c00e06c3708..b6d665a2958 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_lo_top_with_hill.png and b/test/image/baselines/cheater_constraint_inner_range_lo_top_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_lo_top_with_valley.png b/test/image/baselines/cheater_constraint_inner_range_lo_top_with_valley.png
index 8dd6c2c61d8..c80f57624bf 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_lo_top_with_valley.png and b/test/image/baselines/cheater_constraint_inner_range_lo_top_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_with_hill.png b/test/image/baselines/cheater_constraint_inner_range_with_hill.png
index c4f6fffe24d..1926275efdb 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_with_hill.png and b/test/image/baselines/cheater_constraint_inner_range_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_inner_range_with_valley.png b/test/image/baselines/cheater_constraint_inner_range_with_valley.png
index e5d16d9958b..e624bd7d7e2 100644
Binary files a/test/image/baselines/cheater_constraint_inner_range_with_valley.png and b/test/image/baselines/cheater_constraint_inner_range_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_less_than.png b/test/image/baselines/cheater_constraint_less_than.png
index c30c6e79164..9b31ca23f71 100644
Binary files a/test/image/baselines/cheater_constraint_less_than.png and b/test/image/baselines/cheater_constraint_less_than.png differ
diff --git a/test/image/baselines/cheater_constraint_less_than_with_hill.png b/test/image/baselines/cheater_constraint_less_than_with_hill.png
index 4fd274bf205..d132642f1be 100644
Binary files a/test/image/baselines/cheater_constraint_less_than_with_hill.png and b/test/image/baselines/cheater_constraint_less_than_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_less_than_with_valley.png b/test/image/baselines/cheater_constraint_less_than_with_valley.png
index 6c768a76dc0..40cf9f3d0d3 100644
Binary files a/test/image/baselines/cheater_constraint_less_than_with_valley.png and b/test/image/baselines/cheater_constraint_less_than_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range.png b/test/image/baselines/cheater_constraint_outer_range.png
index f1432a4f6e9..8228721ad09 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range.png and b/test/image/baselines/cheater_constraint_outer_range.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_hi_top.png b/test/image/baselines/cheater_constraint_outer_range_hi_top.png
index 8c388507d0c..f6128c23f82 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_hi_top.png and b/test/image/baselines/cheater_constraint_outer_range_hi_top.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_hi_top_with_hill.png b/test/image/baselines/cheater_constraint_outer_range_hi_top_with_hill.png
index 1cb4f3f3a3d..3724a980642 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_hi_top_with_hill.png and b/test/image/baselines/cheater_constraint_outer_range_hi_top_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_hi_top_with_valley.png b/test/image/baselines/cheater_constraint_outer_range_hi_top_with_valley.png
index b78f7beb7fc..7bf09f33105 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_hi_top_with_valley.png and b/test/image/baselines/cheater_constraint_outer_range_hi_top_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_lo_top.png b/test/image/baselines/cheater_constraint_outer_range_lo_top.png
index 34dd7977426..bf4c3606f71 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_lo_top.png and b/test/image/baselines/cheater_constraint_outer_range_lo_top.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_lo_top_with_hill.png b/test/image/baselines/cheater_constraint_outer_range_lo_top_with_hill.png
index 5e24bfab675..abb7b06a329 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_lo_top_with_hill.png and b/test/image/baselines/cheater_constraint_outer_range_lo_top_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_lo_top_with_valley.png b/test/image/baselines/cheater_constraint_outer_range_lo_top_with_valley.png
index 6bd52cdda65..82d6acc63da 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_lo_top_with_valley.png and b/test/image/baselines/cheater_constraint_outer_range_lo_top_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_with_hill.png b/test/image/baselines/cheater_constraint_outer_range_with_hill.png
index a8241c98fec..0d7d02f440b 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_with_hill.png and b/test/image/baselines/cheater_constraint_outer_range_with_hill.png differ
diff --git a/test/image/baselines/cheater_constraint_outer_range_with_valley.png b/test/image/baselines/cheater_constraint_outer_range_with_valley.png
index 3473948647d..25c5cce2b94 100644
Binary files a/test/image/baselines/cheater_constraint_outer_range_with_valley.png and b/test/image/baselines/cheater_constraint_outer_range_with_valley.png differ
diff --git a/test/image/baselines/cheater_constraints.png b/test/image/baselines/cheater_constraints.png
index e8edc4d40ff..25da809facf 100644
Binary files a/test/image/baselines/cheater_constraints.png and b/test/image/baselines/cheater_constraints.png differ
diff --git a/test/image/baselines/cheater_contour.png b/test/image/baselines/cheater_contour.png
index a47a4ededa3..2c3645d5778 100644
Binary files a/test/image/baselines/cheater_contour.png and b/test/image/baselines/cheater_contour.png differ
diff --git a/test/image/baselines/cheater_fully_filled.png b/test/image/baselines/cheater_fully_filled.png
index 1c7f63fd54d..feef44b389c 100644
Binary files a/test/image/baselines/cheater_fully_filled.png and b/test/image/baselines/cheater_fully_filled.png differ
diff --git a/test/image/baselines/cheater_smooth.png b/test/image/baselines/cheater_smooth.png
index 3087e107ade..1edb6600a13 100644
Binary files a/test/image/baselines/cheater_smooth.png and b/test/image/baselines/cheater_smooth.png differ
diff --git a/test/image/baselines/cliponaxis_false.png b/test/image/baselines/cliponaxis_false.png
index 43f2dce8423..59d72538191 100644
Binary files a/test/image/baselines/cliponaxis_false.png and b/test/image/baselines/cliponaxis_false.png differ
diff --git a/test/image/baselines/colorbar_enumerated_ticks.png b/test/image/baselines/colorbar_enumerated_ticks.png
index 30ece2b78f9..5e9b2dcc789 100644
Binary files a/test/image/baselines/colorbar_enumerated_ticks.png and b/test/image/baselines/colorbar_enumerated_ticks.png differ
diff --git a/test/image/baselines/colorbar_tick_prefix_suffix.png b/test/image/baselines/colorbar_tick_prefix_suffix.png
index 2d78db5304d..3730b31eb65 100644
Binary files a/test/image/baselines/colorbar_tick_prefix_suffix.png and b/test/image/baselines/colorbar_tick_prefix_suffix.png differ
diff --git a/test/image/baselines/colorbar_tickformat.png b/test/image/baselines/colorbar_tickformat.png
index 2d63b13c41a..483e107bb52 100644
Binary files a/test/image/baselines/colorbar_tickformat.png and b/test/image/baselines/colorbar_tickformat.png differ
diff --git a/test/image/baselines/colorscale_constraint.png b/test/image/baselines/colorscale_constraint.png
index 6f197e8547f..d755bcdfbae 100644
Binary files a/test/image/baselines/colorscale_constraint.png and b/test/image/baselines/colorscale_constraint.png differ
diff --git a/test/image/baselines/colorscale_opacity.png b/test/image/baselines/colorscale_opacity.png
index ac0b7c91f11..55a0c07f3cd 100644
Binary files a/test/image/baselines/colorscale_opacity.png and b/test/image/baselines/colorscale_opacity.png differ
diff --git a/test/image/baselines/connectgaps_2d.png b/test/image/baselines/connectgaps_2d.png
index da76761995f..80bdf117b11 100644
Binary files a/test/image/baselines/connectgaps_2d.png and b/test/image/baselines/connectgaps_2d.png differ
diff --git a/test/image/baselines/contour_edge_cases.png b/test/image/baselines/contour_edge_cases.png
index db17de50e16..81d1e4be56b 100644
Binary files a/test/image/baselines/contour_edge_cases.png and b/test/image/baselines/contour_edge_cases.png differ
diff --git a/test/image/baselines/contour_heatmap_coloring.png b/test/image/baselines/contour_heatmap_coloring.png
index 3cd6d809fe0..48141cc3b60 100644
Binary files a/test/image/baselines/contour_heatmap_coloring.png and b/test/image/baselines/contour_heatmap_coloring.png differ
diff --git a/test/image/baselines/contour_lines_coloring.png b/test/image/baselines/contour_lines_coloring.png
index b77a3eb2e1b..9b2fc5ca51f 100644
Binary files a/test/image/baselines/contour_lines_coloring.png and b/test/image/baselines/contour_lines_coloring.png differ
diff --git a/test/image/baselines/contour_log.png b/test/image/baselines/contour_log.png
index 421db2d8fbb..e5cbbae7e17 100644
Binary files a/test/image/baselines/contour_log.png and b/test/image/baselines/contour_log.png differ
diff --git a/test/image/baselines/contour_match_edges.png b/test/image/baselines/contour_match_edges.png
index b11b6a2d1c5..3f965e83545 100644
Binary files a/test/image/baselines/contour_match_edges.png and b/test/image/baselines/contour_match_edges.png differ
diff --git a/test/image/baselines/contour_nolines.png b/test/image/baselines/contour_nolines.png
index 89b0b318949..63b6b77f733 100644
Binary files a/test/image/baselines/contour_nolines.png and b/test/image/baselines/contour_nolines.png differ
diff --git a/test/image/baselines/contour_scatter.png b/test/image/baselines/contour_scatter.png
index c9285faea72..aba6976d3d8 100644
Binary files a/test/image/baselines/contour_scatter.png and b/test/image/baselines/contour_scatter.png differ
diff --git a/test/image/baselines/contour_transposed-irregular.png b/test/image/baselines/contour_transposed-irregular.png
index cd063da92cc..71a8a98538c 100644
Binary files a/test/image/baselines/contour_transposed-irregular.png and b/test/image/baselines/contour_transposed-irregular.png differ
diff --git a/test/image/baselines/contour_transposed.png b/test/image/baselines/contour_transposed.png
index 1e4a8b63349..7c661234040 100644
Binary files a/test/image/baselines/contour_transposed.png and b/test/image/baselines/contour_transposed.png differ
diff --git a/test/image/baselines/contour_valid_ses.png b/test/image/baselines/contour_valid_ses.png
index 3e44ef7efef..8705296ab22 100644
Binary files a/test/image/baselines/contour_valid_ses.png and b/test/image/baselines/contour_valid_ses.png differ
diff --git a/test/image/baselines/contour_xyz-gaps-on-sides.png b/test/image/baselines/contour_xyz-gaps-on-sides.png
index fd0177c4404..9b1404bfa1d 100644
Binary files a/test/image/baselines/contour_xyz-gaps-on-sides.png and b/test/image/baselines/contour_xyz-gaps-on-sides.png differ
diff --git a/test/image/baselines/custom_colorscale.png b/test/image/baselines/custom_colorscale.png
index 339f45bf7be..dd011ec425a 100644
Binary files a/test/image/baselines/custom_colorscale.png and b/test/image/baselines/custom_colorscale.png differ
diff --git a/test/image/baselines/custom_size_subplot.png b/test/image/baselines/custom_size_subplot.png
index e8fcddc8aef..afdd56ddd41 100644
Binary files a/test/image/baselines/custom_size_subplot.png and b/test/image/baselines/custom_size_subplot.png differ
diff --git a/test/image/baselines/date_axes.png b/test/image/baselines/date_axes.png
index bc7a8e367bc..d7914ff7f58 100644
Binary files a/test/image/baselines/date_axes.png and b/test/image/baselines/date_axes.png differ
diff --git a/test/image/baselines/date_histogram.png b/test/image/baselines/date_histogram.png
index 34b39dbf5e0..ece7dafef78 100644
Binary files a/test/image/baselines/date_histogram.png and b/test/image/baselines/date_histogram.png differ
diff --git a/test/image/baselines/dendrogram.png b/test/image/baselines/dendrogram.png
index 92de5e5cbf4..e94e7bf572d 100644
Binary files a/test/image/baselines/dendrogram.png and b/test/image/baselines/dendrogram.png differ
diff --git a/test/image/baselines/earth_heatmap.png b/test/image/baselines/earth_heatmap.png
index bb1397cdbce..49c0e725aea 100644
Binary files a/test/image/baselines/earth_heatmap.png and b/test/image/baselines/earth_heatmap.png differ
diff --git a/test/image/baselines/electric_heatmap.png b/test/image/baselines/electric_heatmap.png
index 3652f1ec584..f3fb2c3a8a2 100644
Binary files a/test/image/baselines/electric_heatmap.png and b/test/image/baselines/electric_heatmap.png differ
diff --git a/test/image/baselines/error_bar_asymmetric_array.png b/test/image/baselines/error_bar_asymmetric_array.png
index 795fb4f489a..4360c77477e 100644
Binary files a/test/image/baselines/error_bar_asymmetric_array.png and b/test/image/baselines/error_bar_asymmetric_array.png differ
diff --git a/test/image/baselines/error_bar_asymmetric_constant.png b/test/image/baselines/error_bar_asymmetric_constant.png
index 8b9ce15a0c1..fbb154d68c3 100644
Binary files a/test/image/baselines/error_bar_asymmetric_constant.png and b/test/image/baselines/error_bar_asymmetric_constant.png differ
diff --git a/test/image/baselines/error_bar_bar.png b/test/image/baselines/error_bar_bar.png
index 3ac2a1ebb2d..7655d5087a4 100644
Binary files a/test/image/baselines/error_bar_bar.png and b/test/image/baselines/error_bar_bar.png differ
diff --git a/test/image/baselines/error_bar_horizontal.png b/test/image/baselines/error_bar_horizontal.png
index 32916efe472..5511468b400 100644
Binary files a/test/image/baselines/error_bar_horizontal.png and b/test/image/baselines/error_bar_horizontal.png differ
diff --git a/test/image/baselines/error_bar_layers.png b/test/image/baselines/error_bar_layers.png
index d1b65edd0c4..63ad61d3ee8 100644
Binary files a/test/image/baselines/error_bar_layers.png and b/test/image/baselines/error_bar_layers.png differ
diff --git a/test/image/baselines/error_bar_sqrt.png b/test/image/baselines/error_bar_sqrt.png
index 1be589a31cc..81914bca512 100644
Binary files a/test/image/baselines/error_bar_sqrt.png and b/test/image/baselines/error_bar_sqrt.png differ
diff --git a/test/image/baselines/error_bar_style.png b/test/image/baselines/error_bar_style.png
index b08842c0d5c..103ca2d053f 100644
Binary files a/test/image/baselines/error_bar_style.png and b/test/image/baselines/error_bar_style.png differ
diff --git a/test/image/baselines/finance_style.png b/test/image/baselines/finance_style.png
index c9902e3eb3f..ac72e76f013 100644
Binary files a/test/image/baselines/finance_style.png and b/test/image/baselines/finance_style.png differ
diff --git a/test/image/baselines/geo_big-frame.png b/test/image/baselines/geo_big-frame.png
index e4c849b971c..cea96bd27b7 100644
Binary files a/test/image/baselines/geo_big-frame.png and b/test/image/baselines/geo_big-frame.png differ
diff --git a/test/image/baselines/geo_choropleth-text.png b/test/image/baselines/geo_choropleth-text.png
index 015965b7a53..f99718126de 100644
Binary files a/test/image/baselines/geo_choropleth-text.png and b/test/image/baselines/geo_choropleth-text.png differ
diff --git a/test/image/baselines/geo_choropleth-usa.png b/test/image/baselines/geo_choropleth-usa.png
index b8d5fc2ff0d..907be08490a 100644
Binary files a/test/image/baselines/geo_choropleth-usa.png and b/test/image/baselines/geo_choropleth-usa.png differ
diff --git a/test/image/baselines/geo_conic-conformal.png b/test/image/baselines/geo_conic-conformal.png
index f5db3f93540..6b22d992168 100644
Binary files a/test/image/baselines/geo_conic-conformal.png and b/test/image/baselines/geo_conic-conformal.png differ
diff --git a/test/image/baselines/geo_country-names.png b/test/image/baselines/geo_country-names.png
index c81f6352039..156e4d175e6 100644
Binary files a/test/image/baselines/geo_country-names.png and b/test/image/baselines/geo_country-names.png differ
diff --git a/test/image/baselines/geo_custom-colorscale.png b/test/image/baselines/geo_custom-colorscale.png
index 4277a04a27c..1d21bef9104 100644
Binary files a/test/image/baselines/geo_custom-colorscale.png and b/test/image/baselines/geo_custom-colorscale.png differ
diff --git a/test/image/baselines/geo_europe-bubbles.png b/test/image/baselines/geo_europe-bubbles.png
index eb08662094d..cdcf55fe787 100644
Binary files a/test/image/baselines/geo_europe-bubbles.png and b/test/image/baselines/geo_europe-bubbles.png differ
diff --git a/test/image/baselines/geo_first.png b/test/image/baselines/geo_first.png
index d123ae58bfc..7f4be6e3486 100644
Binary files a/test/image/baselines/geo_first.png and b/test/image/baselines/geo_first.png differ
diff --git a/test/image/baselines/geo_kavrayskiy7.png b/test/image/baselines/geo_kavrayskiy7.png
index 9302a3c661d..4647107c56e 100644
Binary files a/test/image/baselines/geo_kavrayskiy7.png and b/test/image/baselines/geo_kavrayskiy7.png differ
diff --git a/test/image/baselines/geo_multiple-usa-choropleths.png b/test/image/baselines/geo_multiple-usa-choropleths.png
index 951982d2a30..f98da60820b 100644
Binary files a/test/image/baselines/geo_multiple-usa-choropleths.png and b/test/image/baselines/geo_multiple-usa-choropleths.png differ
diff --git a/test/image/baselines/geo_orthographic.png b/test/image/baselines/geo_orthographic.png
index 90835c2980e..9cb6ffe315e 100644
Binary files a/test/image/baselines/geo_orthographic.png and b/test/image/baselines/geo_orthographic.png differ
diff --git a/test/image/baselines/geo_second.png b/test/image/baselines/geo_second.png
index d4aa1075cd0..7e7da69d10b 100644
Binary files a/test/image/baselines/geo_second.png and b/test/image/baselines/geo_second.png differ
diff --git a/test/image/baselines/geo_stereographic.png b/test/image/baselines/geo_stereographic.png
index c655002b29f..026f06e0e77 100644
Binary files a/test/image/baselines/geo_stereographic.png and b/test/image/baselines/geo_stereographic.png differ
diff --git a/test/image/baselines/geo_usa-states.png b/test/image/baselines/geo_usa-states.png
index bc232971da1..06c5c681ea4 100644
Binary files a/test/image/baselines/geo_usa-states.png and b/test/image/baselines/geo_usa-states.png differ
diff --git a/test/image/baselines/gl2d_heatmapgl.png b/test/image/baselines/gl2d_heatmapgl.png
index 82b45f844e5..df8694bf2fd 100644
Binary files a/test/image/baselines/gl2d_heatmapgl.png and b/test/image/baselines/gl2d_heatmapgl.png differ
diff --git a/test/image/baselines/gl2d_parcoords.png b/test/image/baselines/gl2d_parcoords.png
index 8906b42dd67..40e39551503 100644
Binary files a/test/image/baselines/gl2d_parcoords.png and b/test/image/baselines/gl2d_parcoords.png differ
diff --git a/test/image/baselines/gl2d_parcoords_1.png b/test/image/baselines/gl2d_parcoords_1.png
index 5ef8844c4f2..449da98f0ed 100644
Binary files a/test/image/baselines/gl2d_parcoords_1.png and b/test/image/baselines/gl2d_parcoords_1.png differ
diff --git a/test/image/baselines/gl2d_parcoords_2.png b/test/image/baselines/gl2d_parcoords_2.png
index 6b30941fbb5..4eebd736916 100644
Binary files a/test/image/baselines/gl2d_parcoords_2.png and b/test/image/baselines/gl2d_parcoords_2.png differ
diff --git a/test/image/baselines/gl2d_parcoords_large.png b/test/image/baselines/gl2d_parcoords_large.png
index 492369d28a0..8afe02d6539 100644
Binary files a/test/image/baselines/gl2d_parcoords_large.png and b/test/image/baselines/gl2d_parcoords_large.png differ
diff --git a/test/image/baselines/gl2d_scatter-colorscale-colorbar.png b/test/image/baselines/gl2d_scatter-colorscale-colorbar.png
index 3564bdb23c2..73b9ae98016 100644
Binary files a/test/image/baselines/gl2d_scatter-colorscale-colorbar.png and b/test/image/baselines/gl2d_scatter-colorscale-colorbar.png differ
diff --git a/test/image/baselines/gl3d_autocolorscale.png b/test/image/baselines/gl3d_autocolorscale.png
index 4bec636020d..22601bd3c50 100644
Binary files a/test/image/baselines/gl3d_autocolorscale.png and b/test/image/baselines/gl3d_autocolorscale.png differ
diff --git a/test/image/baselines/gl3d_autorange-zero.png b/test/image/baselines/gl3d_autorange-zero.png
index 59caf133894..47340e055a3 100644
Binary files a/test/image/baselines/gl3d_autorange-zero.png and b/test/image/baselines/gl3d_autorange-zero.png differ
diff --git a/test/image/baselines/gl3d_bunny-hull.png b/test/image/baselines/gl3d_bunny-hull.png
index ce9978455d9..56ac4f9bd60 100644
Binary files a/test/image/baselines/gl3d_bunny-hull.png and b/test/image/baselines/gl3d_bunny-hull.png differ
diff --git a/test/image/baselines/gl3d_bunny.png b/test/image/baselines/gl3d_bunny.png
index 4cb5a8ccafc..f9d7d612ed5 100644
Binary files a/test/image/baselines/gl3d_bunny.png and b/test/image/baselines/gl3d_bunny.png differ
diff --git a/test/image/baselines/gl3d_chrisp-nan-1.png b/test/image/baselines/gl3d_chrisp-nan-1.png
index 12204ffa1ca..5f4606ca222 100644
Binary files a/test/image/baselines/gl3d_chrisp-nan-1.png and b/test/image/baselines/gl3d_chrisp-nan-1.png differ
diff --git a/test/image/baselines/gl3d_contour-lines.png b/test/image/baselines/gl3d_contour-lines.png
index 589e628c79f..d9019b311e3 100644
Binary files a/test/image/baselines/gl3d_contour-lines.png and b/test/image/baselines/gl3d_contour-lines.png differ
diff --git a/test/image/baselines/gl3d_convex-hull.png b/test/image/baselines/gl3d_convex-hull.png
index 4cb5a8ccafc..f9d7d612ed5 100644
Binary files a/test/image/baselines/gl3d_convex-hull.png and b/test/image/baselines/gl3d_convex-hull.png differ
diff --git a/test/image/baselines/gl3d_cufflinks.png b/test/image/baselines/gl3d_cufflinks.png
index 809e2296303..3a07c08f040 100644
Binary files a/test/image/baselines/gl3d_cufflinks.png and b/test/image/baselines/gl3d_cufflinks.png differ
diff --git a/test/image/baselines/gl3d_ibm-plot.png b/test/image/baselines/gl3d_ibm-plot.png
index e3b0fe45a3a..946b58ea7d1 100644
Binary files a/test/image/baselines/gl3d_ibm-plot.png and b/test/image/baselines/gl3d_ibm-plot.png differ
diff --git a/test/image/baselines/gl3d_nan-holes.png b/test/image/baselines/gl3d_nan-holes.png
index 7e5a838b500..16a9193fa5f 100644
Binary files a/test/image/baselines/gl3d_nan-holes.png and b/test/image/baselines/gl3d_nan-holes.png differ
diff --git a/test/image/baselines/gl3d_ribbons.png b/test/image/baselines/gl3d_ribbons.png
index c408c7ea448..7af7e756adb 100644
Binary files a/test/image/baselines/gl3d_ribbons.png and b/test/image/baselines/gl3d_ribbons.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-colorscale.png b/test/image/baselines/gl3d_scatter3d-colorscale.png
index f9775860d5a..7fccb43ac81 100644
Binary files a/test/image/baselines/gl3d_scatter3d-colorscale.png and b/test/image/baselines/gl3d_scatter3d-colorscale.png differ
diff --git a/test/image/baselines/gl3d_surface-circular-colorscale.png b/test/image/baselines/gl3d_surface-circular-colorscale.png
index 2d429888867..192c0c52db6 100644
Binary files a/test/image/baselines/gl3d_surface-circular-colorscale.png and b/test/image/baselines/gl3d_surface-circular-colorscale.png differ
diff --git a/test/image/baselines/gl3d_surface-lighting.png b/test/image/baselines/gl3d_surface-lighting.png
index 55ae74160ca..f7274fad5b8 100644
Binary files a/test/image/baselines/gl3d_surface-lighting.png and b/test/image/baselines/gl3d_surface-lighting.png differ
diff --git a/test/image/baselines/gl3d_surface_intensity.png b/test/image/baselines/gl3d_surface_intensity.png
index 53327bb75d9..3f7641c9211 100644
Binary files a/test/image/baselines/gl3d_surface_intensity.png and b/test/image/baselines/gl3d_surface_intensity.png differ
diff --git a/test/image/baselines/gl3d_tetrahedra.png b/test/image/baselines/gl3d_tetrahedra.png
index ddd599e69c4..b148964e1dd 100644
Binary files a/test/image/baselines/gl3d_tetrahedra.png and b/test/image/baselines/gl3d_tetrahedra.png differ
diff --git a/test/image/baselines/gl3d_wire-surface.png b/test/image/baselines/gl3d_wire-surface.png
index 9a4502b592f..4666ab34c74 100644
Binary files a/test/image/baselines/gl3d_wire-surface.png and b/test/image/baselines/gl3d_wire-surface.png differ
diff --git a/test/image/baselines/gl3d_xy-defined-ticks.png b/test/image/baselines/gl3d_xy-defined-ticks.png
index 82f474c9ca0..c8dca015801 100644
Binary files a/test/image/baselines/gl3d_xy-defined-ticks.png and b/test/image/baselines/gl3d_xy-defined-ticks.png differ
diff --git a/test/image/baselines/global_font.png b/test/image/baselines/global_font.png
index ae7a70a3748..67e89da9600 100644
Binary files a/test/image/baselines/global_font.png and b/test/image/baselines/global_font.png differ
diff --git a/test/image/baselines/greens_heatmap.png b/test/image/baselines/greens_heatmap.png
index 9d95535b404..bad2f220379 100644
Binary files a/test/image/baselines/greens_heatmap.png and b/test/image/baselines/greens_heatmap.png differ
diff --git a/test/image/baselines/greys_heatmap.png b/test/image/baselines/greys_heatmap.png
index a8b540f497c..9bf513496ff 100644
Binary files a/test/image/baselines/greys_heatmap.png and b/test/image/baselines/greys_heatmap.png differ
diff --git a/test/image/baselines/grouped_bar.png b/test/image/baselines/grouped_bar.png
index bdc4cbb1c10..e9140ee454d 100644
Binary files a/test/image/baselines/grouped_bar.png and b/test/image/baselines/grouped_bar.png differ
diff --git a/test/image/baselines/heatmap-reverse-autocolorscale.png b/test/image/baselines/heatmap-reverse-autocolorscale.png
index 95324d00688..c7dee07c4ac 100644
Binary files a/test/image/baselines/heatmap-reverse-autocolorscale.png and b/test/image/baselines/heatmap-reverse-autocolorscale.png differ
diff --git a/test/image/baselines/heatmap_autocolor_negative.png b/test/image/baselines/heatmap_autocolor_negative.png
index f9cdea79340..fab5d5bc8fa 100644
Binary files a/test/image/baselines/heatmap_autocolor_negative.png and b/test/image/baselines/heatmap_autocolor_negative.png differ
diff --git a/test/image/baselines/heatmap_autocolor_positive.png b/test/image/baselines/heatmap_autocolor_positive.png
index 368e71039cc..edac6745845 100644
Binary files a/test/image/baselines/heatmap_autocolor_positive.png and b/test/image/baselines/heatmap_autocolor_positive.png differ
diff --git a/test/image/baselines/heatmap_brick_padding.png b/test/image/baselines/heatmap_brick_padding.png
index d0a398c67e5..150525879a0 100644
Binary files a/test/image/baselines/heatmap_brick_padding.png and b/test/image/baselines/heatmap_brick_padding.png differ
diff --git a/test/image/baselines/heatmap_multi-trace.png b/test/image/baselines/heatmap_multi-trace.png
index 27ab01075b4..11693e76b76 100644
Binary files a/test/image/baselines/heatmap_multi-trace.png and b/test/image/baselines/heatmap_multi-trace.png differ
diff --git a/test/image/baselines/heatmap_xyz-dates-and-categories.png b/test/image/baselines/heatmap_xyz-dates-and-categories.png
index fcde9f20c67..aaf59fd6ff6 100644
Binary files a/test/image/baselines/heatmap_xyz-dates-and-categories.png and b/test/image/baselines/heatmap_xyz-dates-and-categories.png differ
diff --git a/test/image/baselines/heatmap_xyz-gaps-on-sides.png b/test/image/baselines/heatmap_xyz-gaps-on-sides.png
index 137826d08f1..c75a17cb44f 100644
Binary files a/test/image/baselines/heatmap_xyz-gaps-on-sides.png and b/test/image/baselines/heatmap_xyz-gaps-on-sides.png differ
diff --git a/test/image/baselines/hist2d_summed.png b/test/image/baselines/hist2d_summed.png
index 649ad058eb5..c8a24409300 100644
Binary files a/test/image/baselines/hist2d_summed.png and b/test/image/baselines/hist2d_summed.png differ
diff --git a/test/image/baselines/hist_003_to_093.png b/test/image/baselines/hist_003_to_093.png
index b0b14886508..462f1cc64e3 100644
Binary files a/test/image/baselines/hist_003_to_093.png and b/test/image/baselines/hist_003_to_093.png differ
diff --git a/test/image/baselines/hist_003_to_1.png b/test/image/baselines/hist_003_to_1.png
index b46a786f795..5e5b094a2dd 100644
Binary files a/test/image/baselines/hist_003_to_1.png and b/test/image/baselines/hist_003_to_1.png differ
diff --git a/test/image/baselines/hist_0_to_093.png b/test/image/baselines/hist_0_to_093.png
index 5075790772d..4715469f776 100644
Binary files a/test/image/baselines/hist_0_to_093.png and b/test/image/baselines/hist_0_to_093.png differ
diff --git a/test/image/baselines/hist_0_to_1_midpoints.png b/test/image/baselines/hist_0_to_1_midpoints.png
index aa621967170..5ce60859f17 100644
Binary files a/test/image/baselines/hist_0_to_1_midpoints.png and b/test/image/baselines/hist_0_to_1_midpoints.png differ
diff --git a/test/image/baselines/hist_all_integer.png b/test/image/baselines/hist_all_integer.png
index 1440e7fc1ca..6a995b6b7fc 100644
Binary files a/test/image/baselines/hist_all_integer.png and b/test/image/baselines/hist_all_integer.png differ
diff --git a/test/image/baselines/hist_all_integer_n50.png b/test/image/baselines/hist_all_integer_n50.png
index 7a81c174a06..50c27c9349f 100644
Binary files a/test/image/baselines/hist_all_integer_n50.png and b/test/image/baselines/hist_all_integer_n50.png differ
diff --git a/test/image/baselines/hist_almost_integer.png b/test/image/baselines/hist_almost_integer.png
index dde0a066970..0d360d10788 100644
Binary files a/test/image/baselines/hist_almost_integer.png and b/test/image/baselines/hist_almost_integer.png differ
diff --git a/test/image/baselines/hist_category.png b/test/image/baselines/hist_category.png
index be207a808ad..7c6a03da963 100644
Binary files a/test/image/baselines/hist_category.png and b/test/image/baselines/hist_category.png differ
diff --git a/test/image/baselines/hist_cum_stacked.png b/test/image/baselines/hist_cum_stacked.png
index a12f24cc4bf..29702797e23 100644
Binary files a/test/image/baselines/hist_cum_stacked.png and b/test/image/baselines/hist_cum_stacked.png differ
diff --git a/test/image/baselines/hist_grouped.png b/test/image/baselines/hist_grouped.png
index 9ecbaaf117d..afe4759741f 100644
Binary files a/test/image/baselines/hist_grouped.png and b/test/image/baselines/hist_grouped.png differ
diff --git a/test/image/baselines/hist_stacked.png b/test/image/baselines/hist_stacked.png
index a7763b8926f..6c549fc6817 100644
Binary files a/test/image/baselines/hist_stacked.png and b/test/image/baselines/hist_stacked.png differ
diff --git a/test/image/baselines/hist_summed.png b/test/image/baselines/hist_summed.png
index 973b1d0659f..9f7a7cb5d15 100644
Binary files a/test/image/baselines/hist_summed.png and b/test/image/baselines/hist_summed.png differ
diff --git a/test/image/baselines/hist_valid_ses.png b/test/image/baselines/hist_valid_ses.png
index 0d3de0365c1..8e71146a3fd 100644
Binary files a/test/image/baselines/hist_valid_ses.png and b/test/image/baselines/hist_valid_ses.png differ
diff --git a/test/image/baselines/hist_valid_ses_y.png b/test/image/baselines/hist_valid_ses_y.png
index d40039fc288..717588940d9 100644
Binary files a/test/image/baselines/hist_valid_ses_y.png and b/test/image/baselines/hist_valid_ses_y.png differ
diff --git a/test/image/baselines/histogram_colorscale.png b/test/image/baselines/histogram_colorscale.png
index c83af4bd5e2..7dda32cbf18 100644
Binary files a/test/image/baselines/histogram_colorscale.png and b/test/image/baselines/histogram_colorscale.png differ
diff --git a/test/image/baselines/hot_heatmap.png b/test/image/baselines/hot_heatmap.png
index ddacbd04b0f..584435ca57e 100644
Binary files a/test/image/baselines/hot_heatmap.png and b/test/image/baselines/hot_heatmap.png differ
diff --git a/test/image/baselines/jet_heatmap.png b/test/image/baselines/jet_heatmap.png
index 7386afde291..885b29c8eaa 100644
Binary files a/test/image/baselines/jet_heatmap.png and b/test/image/baselines/jet_heatmap.png differ
diff --git a/test/image/baselines/labelled_heatmap.png b/test/image/baselines/labelled_heatmap.png
index b8b0b90e6ac..f39c6852bcb 100644
Binary files a/test/image/baselines/labelled_heatmap.png and b/test/image/baselines/labelled_heatmap.png differ
diff --git a/test/image/baselines/layout_image.png b/test/image/baselines/layout_image.png
index 1ea7021287a..afbe9ad177c 100644
Binary files a/test/image/baselines/layout_image.png and b/test/image/baselines/layout_image.png differ
diff --git a/test/image/baselines/legend_horizontal.png b/test/image/baselines/legend_horizontal.png
index a218a2bc4f4..403ff3053fa 100644
Binary files a/test/image/baselines/legend_horizontal.png and b/test/image/baselines/legend_horizontal.png differ
diff --git a/test/image/baselines/legend_horizontal_autowrap.png b/test/image/baselines/legend_horizontal_autowrap.png
index afd09cf300e..d3d284bf01a 100644
Binary files a/test/image/baselines/legend_horizontal_autowrap.png and b/test/image/baselines/legend_horizontal_autowrap.png differ
diff --git a/test/image/baselines/legend_horizontal_groups.png b/test/image/baselines/legend_horizontal_groups.png
index 7df8bd805e8..4651f8e5e03 100644
Binary files a/test/image/baselines/legend_horizontal_groups.png and b/test/image/baselines/legend_horizontal_groups.png differ
diff --git a/test/image/baselines/legend_inside.png b/test/image/baselines/legend_inside.png
index 43e346b98ef..7484b34e1be 100644
Binary files a/test/image/baselines/legend_inside.png and b/test/image/baselines/legend_inside.png differ
diff --git a/test/image/baselines/legend_labels.png b/test/image/baselines/legend_labels.png
index 6b9cbd995e7..dcb3857a802 100644
Binary files a/test/image/baselines/legend_labels.png and b/test/image/baselines/legend_labels.png differ
diff --git a/test/image/baselines/legend_negative_y.png b/test/image/baselines/legend_negative_y.png
index de930a6459d..5b32d355a00 100644
Binary files a/test/image/baselines/legend_negative_y.png and b/test/image/baselines/legend_negative_y.png differ
diff --git a/test/image/baselines/legend_outside.png b/test/image/baselines/legend_outside.png
index fe148a305fe..d71185dd549 100644
Binary files a/test/image/baselines/legend_outside.png and b/test/image/baselines/legend_outside.png differ
diff --git a/test/image/baselines/legend_scroll.png b/test/image/baselines/legend_scroll.png
index e4e80fc403b..f072e5b5de5 100644
Binary files a/test/image/baselines/legend_scroll.png and b/test/image/baselines/legend_scroll.png differ
diff --git a/test/image/baselines/legend_style.png b/test/image/baselines/legend_style.png
index 8e6ba7e52fa..c3a4dbf6c8e 100644
Binary files a/test/image/baselines/legend_style.png and b/test/image/baselines/legend_style.png differ
diff --git a/test/image/baselines/legend_visibility.png b/test/image/baselines/legend_visibility.png
index 860bc716f06..5f1e636add9 100644
Binary files a/test/image/baselines/legend_visibility.png and b/test/image/baselines/legend_visibility.png differ
diff --git a/test/image/baselines/legendgroup.png b/test/image/baselines/legendgroup.png
index 9ebdd53fa54..ff8c3062c59 100644
Binary files a/test/image/baselines/legendgroup.png and b/test/image/baselines/legendgroup.png differ
diff --git a/test/image/baselines/legendgroup_bar-stack.png b/test/image/baselines/legendgroup_bar-stack.png
index 1c205b1d7b4..450334f264e 100644
Binary files a/test/image/baselines/legendgroup_bar-stack.png and b/test/image/baselines/legendgroup_bar-stack.png differ
diff --git a/test/image/baselines/line_grid_color.png b/test/image/baselines/line_grid_color.png
index 8901057cae7..d38e8b39c78 100644
Binary files a/test/image/baselines/line_grid_color.png and b/test/image/baselines/line_grid_color.png differ
diff --git a/test/image/baselines/line_grid_width.png b/test/image/baselines/line_grid_width.png
index 94d3320d70c..da67496c1a9 100644
Binary files a/test/image/baselines/line_grid_width.png and b/test/image/baselines/line_grid_width.png differ
diff --git a/test/image/baselines/line_scatter.png b/test/image/baselines/line_scatter.png
index 9e2544a3c23..016c887521f 100644
Binary files a/test/image/baselines/line_scatter.png and b/test/image/baselines/line_scatter.png differ
diff --git a/test/image/baselines/line_style.png b/test/image/baselines/line_style.png
index 5b7949b5d05..9c4e5a3adca 100644
Binary files a/test/image/baselines/line_style.png and b/test/image/baselines/line_style.png differ
diff --git a/test/image/baselines/marker_line_width.png b/test/image/baselines/marker_line_width.png
index a9fa974dcdf..77f6bb59ee0 100644
Binary files a/test/image/baselines/marker_line_width.png and b/test/image/baselines/marker_line_width.png differ
diff --git a/test/image/baselines/marker_symbols.png b/test/image/baselines/marker_symbols.png
index 60646e31a2c..527a3fa66df 100644
Binary files a/test/image/baselines/marker_symbols.png and b/test/image/baselines/marker_symbols.png differ
diff --git a/test/image/baselines/multiple_axes_double.png b/test/image/baselines/multiple_axes_double.png
index 9185bb90df9..e053363b4a8 100644
Binary files a/test/image/baselines/multiple_axes_double.png and b/test/image/baselines/multiple_axes_double.png differ
diff --git a/test/image/baselines/multiple_axes_multiple.png b/test/image/baselines/multiple_axes_multiple.png
index 7bdf1630883..7cf933fe0e7 100644
Binary files a/test/image/baselines/multiple_axes_multiple.png and b/test/image/baselines/multiple_axes_multiple.png differ
diff --git a/test/image/baselines/multiple_subplots.png b/test/image/baselines/multiple_subplots.png
index 465f7c634b0..53f92b568d9 100644
Binary files a/test/image/baselines/multiple_subplots.png and b/test/image/baselines/multiple_subplots.png differ
diff --git a/test/image/baselines/ohlc_first.png b/test/image/baselines/ohlc_first.png
index 1324765b138..ddac6bf2b50 100644
Binary files a/test/image/baselines/ohlc_first.png and b/test/image/baselines/ohlc_first.png differ
diff --git a/test/image/baselines/overlaying-axis-lines.png b/test/image/baselines/overlaying-axis-lines.png
index 76c4532678e..7df0a3d4360 100644
Binary files a/test/image/baselines/overlaying-axis-lines.png and b/test/image/baselines/overlaying-axis-lines.png differ
diff --git a/test/image/baselines/percent_error_bar.png b/test/image/baselines/percent_error_bar.png
index c4ff935c11f..93c9fb3760c 100644
Binary files a/test/image/baselines/percent_error_bar.png and b/test/image/baselines/percent_error_bar.png differ
diff --git a/test/image/baselines/picnic_heatmap.png b/test/image/baselines/picnic_heatmap.png
index e3679bd20f9..7f954f5cfb9 100644
Binary files a/test/image/baselines/picnic_heatmap.png and b/test/image/baselines/picnic_heatmap.png differ
diff --git a/test/image/baselines/pie_fonts.png b/test/image/baselines/pie_fonts.png
index ed8b084a10b..604622b3ad0 100644
Binary files a/test/image/baselines/pie_fonts.png and b/test/image/baselines/pie_fonts.png differ
diff --git a/test/image/baselines/plot_types.png b/test/image/baselines/plot_types.png
index 645a0528173..b143904d672 100644
Binary files a/test/image/baselines/plot_types.png and b/test/image/baselines/plot_types.png differ
diff --git a/test/image/baselines/polar_scatter.png b/test/image/baselines/polar_scatter.png
index 291740c08b2..ceb3a086fe2 100644
Binary files a/test/image/baselines/polar_scatter.png and b/test/image/baselines/polar_scatter.png differ
diff --git a/test/image/baselines/portland_heatmap.png b/test/image/baselines/portland_heatmap.png
index e4f7c0dc9eb..62f9fec2572 100644
Binary files a/test/image/baselines/portland_heatmap.png and b/test/image/baselines/portland_heatmap.png differ
diff --git a/test/image/baselines/pseudo_html.png b/test/image/baselines/pseudo_html.png
index 269d6ef1f8a..2701f536651 100644
Binary files a/test/image/baselines/pseudo_html.png and b/test/image/baselines/pseudo_html.png differ
diff --git a/test/image/baselines/range_selector.png b/test/image/baselines/range_selector.png
index 9f4d3fa8615..523dc5d3ffe 100644
Binary files a/test/image/baselines/range_selector.png and b/test/image/baselines/range_selector.png differ
diff --git a/test/image/baselines/range_selector_style.png b/test/image/baselines/range_selector_style.png
index d4b8f889dd2..c5be54fd04c 100644
Binary files a/test/image/baselines/range_selector_style.png and b/test/image/baselines/range_selector_style.png differ
diff --git a/test/image/baselines/range_slider.png b/test/image/baselines/range_slider.png
index 705a1a03e29..17fe0ca48cd 100644
Binary files a/test/image/baselines/range_slider.png and b/test/image/baselines/range_slider.png differ
diff --git a/test/image/baselines/range_slider_axes_double.png b/test/image/baselines/range_slider_axes_double.png
index a944a7ad35c..719c6573668 100644
Binary files a/test/image/baselines/range_slider_axes_double.png and b/test/image/baselines/range_slider_axes_double.png differ
diff --git a/test/image/baselines/range_slider_box.png b/test/image/baselines/range_slider_box.png
index ad5a4aef193..e1024d7357a 100644
Binary files a/test/image/baselines/range_slider_box.png and b/test/image/baselines/range_slider_box.png differ
diff --git a/test/image/baselines/range_slider_initial_expanded.png b/test/image/baselines/range_slider_initial_expanded.png
index 1f01352b5da..b2e6ad5d813 100644
Binary files a/test/image/baselines/range_slider_initial_expanded.png and b/test/image/baselines/range_slider_initial_expanded.png differ
diff --git a/test/image/baselines/range_slider_initial_valid.png b/test/image/baselines/range_slider_initial_valid.png
index 1dc3f03000d..28f419638cf 100644
Binary files a/test/image/baselines/range_slider_initial_valid.png and b/test/image/baselines/range_slider_initial_valid.png differ
diff --git a/test/image/baselines/range_slider_multiple.png b/test/image/baselines/range_slider_multiple.png
index fd21495ea7a..14740cbb86c 100644
Binary files a/test/image/baselines/range_slider_multiple.png and b/test/image/baselines/range_slider_multiple.png differ
diff --git a/test/image/baselines/rdbu_heatmap.png b/test/image/baselines/rdbu_heatmap.png
index bd111e071e3..41c11ed27cf 100644
Binary files a/test/image/baselines/rdbu_heatmap.png and b/test/image/baselines/rdbu_heatmap.png differ
diff --git a/test/image/baselines/scatter-colorscale-colorbar.png b/test/image/baselines/scatter-colorscale-colorbar.png
index 9577825e564..2e0543171c3 100644
Binary files a/test/image/baselines/scatter-colorscale-colorbar.png and b/test/image/baselines/scatter-colorscale-colorbar.png differ
diff --git a/test/image/baselines/scatter-marker-line-colorscales.png b/test/image/baselines/scatter-marker-line-colorscales.png
index def42b98d12..21fd18d8fe5 100644
Binary files a/test/image/baselines/scatter-marker-line-colorscales.png and b/test/image/baselines/scatter-marker-line-colorscales.png differ
diff --git a/test/image/baselines/scatter_fill_no_opacity.png b/test/image/baselines/scatter_fill_no_opacity.png
index 4a6d73cd45a..74e47098f1a 100644
Binary files a/test/image/baselines/scatter_fill_no_opacity.png and b/test/image/baselines/scatter_fill_no_opacity.png differ
diff --git a/test/image/baselines/scatter_fill_self_next.png b/test/image/baselines/scatter_fill_self_next.png
index 4bf5797e8b1..d7234007675 100644
Binary files a/test/image/baselines/scatter_fill_self_next.png and b/test/image/baselines/scatter_fill_self_next.png differ
diff --git a/test/image/baselines/scatter_fill_self_opacity.png b/test/image/baselines/scatter_fill_self_opacity.png
index 27dd39f42b6..98909f7d68d 100644
Binary files a/test/image/baselines/scatter_fill_self_opacity.png and b/test/image/baselines/scatter_fill_self_opacity.png differ
diff --git a/test/image/baselines/scattercarpet.png b/test/image/baselines/scattercarpet.png
index 7b277073dfa..441327dca9a 100644
Binary files a/test/image/baselines/scattercarpet.png and b/test/image/baselines/scattercarpet.png differ
diff --git a/test/image/baselines/shapes_below_traces.png b/test/image/baselines/shapes_below_traces.png
index bd8874feb65..73d260a5075 100644
Binary files a/test/image/baselines/shapes_below_traces.png and b/test/image/baselines/shapes_below_traces.png differ
diff --git a/test/image/baselines/shared_axes_subplots.png b/test/image/baselines/shared_axes_subplots.png
index 3a4e3dddf6f..ae8d7ecc758 100644
Binary files a/test/image/baselines/shared_axes_subplots.png and b/test/image/baselines/shared_axes_subplots.png differ
diff --git a/test/image/baselines/show_legend.png b/test/image/baselines/show_legend.png
index aa797d6593c..9f4091a2d91 100644
Binary files a/test/image/baselines/show_legend.png and b/test/image/baselines/show_legend.png differ
diff --git a/test/image/baselines/simple_annotation.png b/test/image/baselines/simple_annotation.png
index 8d503bada98..4b53beff143 100644
Binary files a/test/image/baselines/simple_annotation.png and b/test/image/baselines/simple_annotation.png differ
diff --git a/test/image/baselines/simple_contour.png b/test/image/baselines/simple_contour.png
index 96f454bdc1f..cb82364e1ff 100644
Binary files a/test/image/baselines/simple_contour.png and b/test/image/baselines/simple_contour.png differ
diff --git a/test/image/baselines/simple_inset.png b/test/image/baselines/simple_inset.png
index 3d0619e7d0c..83bb484d031 100644
Binary files a/test/image/baselines/simple_inset.png and b/test/image/baselines/simple_inset.png differ
diff --git a/test/image/baselines/simple_subplot.png b/test/image/baselines/simple_subplot.png
index f4157c2fc3b..35bf6bc71c8 100644
Binary files a/test/image/baselines/simple_subplot.png and b/test/image/baselines/simple_subplot.png differ
diff --git a/test/image/baselines/size_margins.png b/test/image/baselines/size_margins.png
index 6c3f930a746..4f5561a79ee 100644
Binary files a/test/image/baselines/size_margins.png and b/test/image/baselines/size_margins.png differ
diff --git a/test/image/baselines/sliders.png b/test/image/baselines/sliders.png
index e8a9177497f..2271954c2cf 100644
Binary files a/test/image/baselines/sliders.png and b/test/image/baselines/sliders.png differ
diff --git a/test/image/baselines/stacked_bar.png b/test/image/baselines/stacked_bar.png
index 6f590eac105..bfc13442208 100644
Binary files a/test/image/baselines/stacked_bar.png and b/test/image/baselines/stacked_bar.png differ
diff --git a/test/image/baselines/stacked_coupled_subplots.png b/test/image/baselines/stacked_coupled_subplots.png
index 6324f9bafb5..a44b8df9206 100644
Binary files a/test/image/baselines/stacked_coupled_subplots.png and b/test/image/baselines/stacked_coupled_subplots.png differ
diff --git a/test/image/baselines/stacked_subplots.png b/test/image/baselines/stacked_subplots.png
index d16f07be42a..9c813ebc557 100644
Binary files a/test/image/baselines/stacked_subplots.png and b/test/image/baselines/stacked_subplots.png differ
diff --git a/test/image/baselines/stacked_subplots_shared_yaxis.png b/test/image/baselines/stacked_subplots_shared_yaxis.png
index 70a3beea374..8783f79fbd0 100644
Binary files a/test/image/baselines/stacked_subplots_shared_yaxis.png and b/test/image/baselines/stacked_subplots_shared_yaxis.png differ
diff --git a/test/image/baselines/style_bar.png b/test/image/baselines/style_bar.png
index bfd4411e5ae..20a8623d492 100644
Binary files a/test/image/baselines/style_bar.png and b/test/image/baselines/style_bar.png differ
diff --git a/test/image/baselines/styling_names.png b/test/image/baselines/styling_names.png
index 010c1410b1b..bd5545994b9 100644
Binary files a/test/image/baselines/styling_names.png and b/test/image/baselines/styling_names.png differ
diff --git a/test/image/baselines/ternary_array_styles.png b/test/image/baselines/ternary_array_styles.png
index f58c8741dd4..521df1ebcd9 100644
Binary files a/test/image/baselines/ternary_array_styles.png and b/test/image/baselines/ternary_array_styles.png differ
diff --git a/test/image/baselines/ternary_fill.png b/test/image/baselines/ternary_fill.png
index a31859f445c..b7e6f58998d 100644
Binary files a/test/image/baselines/ternary_fill.png and b/test/image/baselines/ternary_fill.png differ
diff --git a/test/image/baselines/ternary_lines.png b/test/image/baselines/ternary_lines.png
index 9cf20933031..7299fedff74 100644
Binary files a/test/image/baselines/ternary_lines.png and b/test/image/baselines/ternary_lines.png differ
diff --git a/test/image/baselines/ternary_markers.png b/test/image/baselines/ternary_markers.png
index 9288c20458b..84ce180097b 100644
Binary files a/test/image/baselines/ternary_markers.png and b/test/image/baselines/ternary_markers.png differ
diff --git a/test/image/baselines/ternary_multiple.png b/test/image/baselines/ternary_multiple.png
index d5c38127d0f..68045c78cd7 100644
Binary files a/test/image/baselines/ternary_multiple.png and b/test/image/baselines/ternary_multiple.png differ
diff --git a/test/image/baselines/ternary_simple.png b/test/image/baselines/ternary_simple.png
index 111ead3bf5f..29486ca35bb 100644
Binary files a/test/image/baselines/ternary_simple.png and b/test/image/baselines/ternary_simple.png differ
diff --git a/test/image/baselines/text_chart_arrays.png b/test/image/baselines/text_chart_arrays.png
index 26ce503ed07..d34b06de5b7 100644
Binary files a/test/image/baselines/text_chart_arrays.png and b/test/image/baselines/text_chart_arrays.png differ
diff --git a/test/image/baselines/text_chart_basic.png b/test/image/baselines/text_chart_basic.png
index b0a340ee826..0e542d274a7 100644
Binary files a/test/image/baselines/text_chart_basic.png and b/test/image/baselines/text_chart_basic.png differ
diff --git a/test/image/baselines/text_chart_invalid-arrays.png b/test/image/baselines/text_chart_invalid-arrays.png
index d08e4a1e63c..bfea64ed5ed 100644
Binary files a/test/image/baselines/text_chart_invalid-arrays.png and b/test/image/baselines/text_chart_invalid-arrays.png differ
diff --git a/test/image/baselines/text_chart_single-string.png b/test/image/baselines/text_chart_single-string.png
index ed3ff0440d2..809ed3df2e9 100644
Binary files a/test/image/baselines/text_chart_single-string.png and b/test/image/baselines/text_chart_single-string.png differ
diff --git a/test/image/baselines/text_chart_styling.png b/test/image/baselines/text_chart_styling.png
index d2384721851..fcfcd89fe4a 100644
Binary files a/test/image/baselines/text_chart_styling.png and b/test/image/baselines/text_chart_styling.png differ
diff --git a/test/image/baselines/text_export.png b/test/image/baselines/text_export.png
index be3206011f5..199caa079a7 100644
Binary files a/test/image/baselines/text_export.png and b/test/image/baselines/text_export.png differ
diff --git a/test/image/baselines/tick-datafn.png b/test/image/baselines/tick-datafn.png
index 476fa13cedb..581cceee7d8 100644
Binary files a/test/image/baselines/tick-datafn.png and b/test/image/baselines/tick-datafn.png differ
diff --git a/test/image/baselines/tick_attributes.png b/test/image/baselines/tick_attributes.png
index ffad2b366c8..b61495409d9 100644
Binary files a/test/image/baselines/tick_attributes.png and b/test/image/baselines/tick_attributes.png differ
diff --git a/test/image/baselines/tick_prefix_suffix.png b/test/image/baselines/tick_prefix_suffix.png
index ebfeffba3ea..16678317b9a 100644
Binary files a/test/image/baselines/tick_prefix_suffix.png and b/test/image/baselines/tick_prefix_suffix.png differ
diff --git a/test/image/baselines/tick_prefix_suffix_exponent.png b/test/image/baselines/tick_prefix_suffix_exponent.png
index d7fbc855539..63ad56e0800 100644
Binary files a/test/image/baselines/tick_prefix_suffix_exponent.png and b/test/image/baselines/tick_prefix_suffix_exponent.png differ
diff --git a/test/image/baselines/tickformat.png b/test/image/baselines/tickformat.png
index ba42c396bfb..971418b83a5 100644
Binary files a/test/image/baselines/tickformat.png and b/test/image/baselines/tickformat.png differ
diff --git a/test/image/baselines/titles-avoid-labels.png b/test/image/baselines/titles-avoid-labels.png
index ffb113f6ae2..58dbb96cef3 100644
Binary files a/test/image/baselines/titles-avoid-labels.png and b/test/image/baselines/titles-avoid-labels.png differ
diff --git a/test/image/baselines/ultra_zoom.png b/test/image/baselines/ultra_zoom.png
index 3670d77fcb0..7117f8e990d 100644
Binary files a/test/image/baselines/ultra_zoom.png and b/test/image/baselines/ultra_zoom.png differ
diff --git a/test/image/baselines/updatemenus.png b/test/image/baselines/updatemenus.png
index 248c2d61f11..616f19ebe79 100644
Binary files a/test/image/baselines/updatemenus.png and b/test/image/baselines/updatemenus.png differ
diff --git a/test/image/baselines/updatemenus_positioning.png b/test/image/baselines/updatemenus_positioning.png
index 9f9fc426fd2..a93e32a1a61 100644
Binary files a/test/image/baselines/updatemenus_positioning.png and b/test/image/baselines/updatemenus_positioning.png differ
diff --git a/test/image/baselines/violins.png b/test/image/baselines/violins.png
index 83a41708854..acd2d779889 100644
Binary files a/test/image/baselines/violins.png and b/test/image/baselines/violins.png differ
diff --git a/test/image/baselines/viridis_heatmap.png b/test/image/baselines/viridis_heatmap.png
index dfd5dcb4def..3524a0bccc2 100644
Binary files a/test/image/baselines/viridis_heatmap.png and b/test/image/baselines/viridis_heatmap.png differ
diff --git a/test/image/baselines/world-cals.png b/test/image/baselines/world-cals.png
index a5263a73199..7bf5e99b49d 100644
Binary files a/test/image/baselines/world-cals.png and b/test/image/baselines/world-cals.png differ
diff --git a/test/image/baselines/yignbu_heatmap.png b/test/image/baselines/yignbu_heatmap.png
index 597438d9ddc..1f07b1fbcd7 100644
Binary files a/test/image/baselines/yignbu_heatmap.png and b/test/image/baselines/yignbu_heatmap.png differ
diff --git a/test/image/baselines/yiorrd_heatmap.png b/test/image/baselines/yiorrd_heatmap.png
index 79e104bee10..04e5c8a825b 100644
Binary files a/test/image/baselines/yiorrd_heatmap.png and b/test/image/baselines/yiorrd_heatmap.png differ
diff --git a/test/image/baselines/zsmooth_methods.png b/test/image/baselines/zsmooth_methods.png
index 4fcbf75279e..e310acde0f9 100644
Binary files a/test/image/baselines/zsmooth_methods.png and b/test/image/baselines/zsmooth_methods.png differ
diff --git a/test/image/mocks/20.json b/test/image/mocks/20.json
index 13e79c0b676..7c8c316924b 100644
--- a/test/image/mocks/20.json
+++ b/test/image/mocks/20.json
@@ -88,10 +88,31 @@
             "name": "yaxis6 data",
             "yaxis": "y6",
             "type": "scatter"
+        },
+        {
+            "x": [1, 2, 3],
+            "y": [1, 2, 3],
+            "xaxis": "x2",
+            "yaxis": "y7",
+            "name": "x2y7"
+        },
+        {
+            "x": [2, 3, 4],
+            "y": [2, 3, 1],
+            "xaxis": "x3",
+            "yaxis": "y8",
+            "name": "x3y8"
+        },
+        {
+            "x": [3, 4, 5],
+            "y": [3, 1, 2],
+            "xaxis": "x4",
+            "yaxis": "y9",
+            "name": "x4y9"
         }
     ],
     "layout": {
-        "title": "multiple y-axes example",
+        "title": "multiple axes example",
         "xaxis": {
             "domain": [
                 0.3,
@@ -99,9 +120,12 @@
             ],
             "showline": true,
             "ticks": "outside",
-            "mirror": true
+            "mirror": true,
+            "linecolor": "rgba(0,0,0,0.5)",
+            "linewidth": 10
         },
         "yaxis": {
+            "domain": [0.5, 1],
             "title": "yaxis title",
             "titlefont": {
                 "color": "#1f77b4"
@@ -112,11 +136,12 @@
             "tickfont": {
                 "color": "#1f77b4"
             },
-            "linecolor": "#1f77b4"
+            "linecolor": "rgba(31,119,180,0.5)",
+            "linewidth": 20
         },
         "legend": {
-            "x": 1.1,
-            "y": 1,
+            "x": 1,
+            "y": 0,
             "bordercolor": "#000",
             "borderwidth": 1
         },
@@ -131,7 +156,8 @@
             "tickfont": {
                 "color": "#ff7f0e"
             },
-            "linecolor": "#ff7f0e",
+            "linecolor": "rgba(255,127,14,0.4)",
+            "linewidth": 6,
             "anchor": "free",
             "position": 0.15,
             "overlaying": "y"
@@ -147,7 +173,7 @@
             "tickfont": {
                 "color": "#2ca02c"
             },
-            "linecolor": "#2ca02c",
+            "linecolor": "rgba(44,160,44,0.5)",
             "anchor": "free",
             "position": 0,
             "overlaying": "y"
@@ -164,7 +190,8 @@
                 "color": "#d62728"
             },
             "showexponent": "last",
-            "linecolor": "#d62728",
+            "linecolor": "rgba(214,39,40,0.5)",
+            "linewidth": 15,
             "side": "right",
             "overlaying": "y"
         },
@@ -181,7 +208,8 @@
             },
             "exponentformat": "power",
             "showexponent": "first",
-            "linecolor": "#9467bd",
+            "linecolor": "rgba(148,103,189,0.5)",
+            "linewidth": 5,
             "anchor": "free",
             "side": "right",
             "position": 0.85,
@@ -199,11 +227,70 @@
                 "color": "#8c564b"
             },
             "exponentformat": "SI",
-            "linecolor": "#8c564b",
+            "linecolor": "rgba(140,86,75,0.5)",
             "anchor": "free",
             "side": "right",
             "position": 1,
             "overlaying": "y"
-        }
+        },
+        "xaxis2": {
+            "title": "xaxis2 title",
+            "domain": [0.2, 0.8],
+            "anchor": "y7",
+            "color": "rgba(100,100,0,0.6)",
+            "showline": true,
+            "ticks": "outside",
+            "linewidth": 3
+        },
+        "xaxis3": {
+            "title": "xaxis3 title",
+            "overlaying": "x2",
+            "anchor": "y7",
+            "color": "rgba(100,0,100,0.6)",
+            "showline": true,
+            "ticks": "outside",
+            "linewidth": 6,
+            "side": "top"
+        },
+        "xaxis4": {
+            "title": "xaxis4 title",
+            "overlaying": "x2",
+            "color": "rgba(0,0,0,0.6)",
+            "showline": true,
+            "ticks": "outside",
+            "position": 0,
+            "anchor": "free"
+        },
+        "yaxis7": {
+            "title": "yaxis7 title",
+            "domain": [0.15, 0.3],
+            "color": "rgba(0,0,0,0.6)",
+            "anchor": "x2",
+            "showline": true,
+            "ticks": "outside",
+            "linewidth": 4
+        },
+        "yaxis8": {
+            "title": "yaxis8 title",
+            "overlaying": "y7",
+            "color": "rgba(0,0,0,0.6)",
+            "anchor": "x2",
+            "side": "right",
+            "showline": true,
+            "ticks": "outside",
+            "linewidth": 8
+        },
+        "yaxis9": {
+            "title": "yaxis9 title",
+            "overlaying": "y7",
+            "color": "rgba(0,0,0,0.6)",
+            "anchor": "free",
+            "position": 0,
+            "showline": true,
+            "ticks": "outside"
+        },
+        "width": 750,
+        "height": 600,
+        "margin": {"r": 200, "l": 50, "t": 50, "b": 50, "pad": 5}
     }
 }