diff --git a/R/theme-defaults.R b/R/theme-defaults.R
index 6ecd6d68c0..d94a8bcc81 100644
--- a/R/theme-defaults.R
+++ b/R/theme-defaults.R
@@ -137,8 +137,8 @@ theme_grey <- function(base_size = 11, base_family = "",
     margins = margin(half_line, half_line, half_line, half_line),
 
     axis.line =          element_blank(),
-    axis.line.x =        NULL,
-    axis.line.y =        NULL,
+    axis.line.x =        element_line(lineend = "square", inherit.blank = TRUE),
+    axis.line.y =        element_line(lineend = "square", inherit.blank = TRUE),
     axis.text =          element_text(size = rel(0.8), colour = "grey30"),
     axis.text.x =        element_text(margin = margin(t = 0.8 * half_line / 2), vjust = 1),
     axis.text.x.top =    element_text(margin = margin(b = 0.8 * half_line / 2), vjust = 0),
diff --git a/tests/testthat/_snaps/coord-polar/bottom-half-circle-with-rotated-text.svg b/tests/testthat/_snaps/coord-polar/bottom-half-circle-with-rotated-text.svg
index 30c4b0fc24..d6eb14756b 100644
--- a/tests/testthat/_snaps/coord-polar/bottom-half-circle-with-rotated-text.svg
+++ b/tests/testthat/_snaps/coord-polar/bottom-half-circle-with-rotated-text.svg
@@ -62,8 +62,8 @@
 <polyline points='391.88,403.28 391.88,406.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='222.85,340.24 221.06,342.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='136.39,181.90 133.68,182.29 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='649.99,145.17 649.84,153.98 649.39,162.78 648.64,171.56 647.59,180.31 646.24,189.02 644.59,197.68 642.65,206.28 640.42,214.80 637.90,223.25 635.09,231.60 632.00,239.86 628.62,248.00 624.97,256.02 621.05,263.92 616.87,271.67 612.42,279.28 607.71,286.73 602.75,294.02 597.54,301.13 592.10,308.06 586.42,314.80 580.52,321.34 574.39,327.68 568.05,333.81 561.51,339.71 554.77,345.39 547.84,350.83 540.73,356.04 533.44,361.00 525.99,365.70 518.38,370.15 510.63,374.34 502.73,378.26 494.71,381.91 486.57,385.28 478.32,388.38 469.96,391.19 461.52,393.71 452.99,395.94 444.39,397.88 435.73,399.53 427.03,400.88 418.27,401.93 409.49,402.68 400.69,403.13 391.88,403.28 383.07,403.13 374.26,402.68 365.48,401.93 356.73,400.88 348.02,399.53 339.36,397.88 330.77,395.94 322.24,393.71 313.80,391.19 305.44,388.38 297.19,385.28 289.05,381.91 281.02,378.26 273.13,374.34 265.37,370.15 257.77,365.70 250.32,361.00 243.03,356.04 235.92,350.83 228.99,345.39 222.25,339.71 215.70,333.81 209.36,327.68 203.24,321.34 197.34,314.80 191.66,308.06 186.21,301.13 181.01,294.02 176.05,286.73 171.34,279.28 166.89,271.67 162.70,263.92 158.78,256.02 155.13,248.00 151.76,239.86 148.67,231.60 145.86,223.25 143.34,214.80 141.10,206.28 139.16,197.68 137.52,189.02 136.17,180.31 135.12,171.56 134.37,162.78 133.92,153.98 133.77,145.17 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: butt;' />
-<polyline points='69.24,145.17 69.24,154.07 69.24,162.97 69.24,171.87 69.24,180.77 69.24,189.67 69.24,198.57 69.24,207.47 69.24,216.37 69.24,225.27 69.24,234.17 69.24,243.07 69.24,251.97 69.24,260.87 69.24,269.77 69.24,278.67 69.24,287.57 69.24,296.47 69.24,305.37 69.24,314.28 69.24,323.18 69.24,332.08 69.24,340.98 69.24,349.88 69.24,358.78 69.24,367.68 69.24,376.58 69.24,385.48 69.24,394.38 69.24,403.28 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: butt;' />
+<polyline points='649.99,145.17 649.84,153.98 649.39,162.78 648.64,171.56 647.59,180.31 646.24,189.02 644.59,197.68 642.65,206.28 640.42,214.80 637.90,223.25 635.09,231.60 632.00,239.86 628.62,248.00 624.97,256.02 621.05,263.92 616.87,271.67 612.42,279.28 607.71,286.73 602.75,294.02 597.54,301.13 592.10,308.06 586.42,314.80 580.52,321.34 574.39,327.68 568.05,333.81 561.51,339.71 554.77,345.39 547.84,350.83 540.73,356.04 533.44,361.00 525.99,365.70 518.38,370.15 510.63,374.34 502.73,378.26 494.71,381.91 486.57,385.28 478.32,388.38 469.96,391.19 461.52,393.71 452.99,395.94 444.39,397.88 435.73,399.53 427.03,400.88 418.27,401.93 409.49,402.68 400.69,403.13 391.88,403.28 383.07,403.13 374.26,402.68 365.48,401.93 356.73,400.88 348.02,399.53 339.36,397.88 330.77,395.94 322.24,393.71 313.80,391.19 305.44,388.38 297.19,385.28 289.05,381.91 281.02,378.26 273.13,374.34 265.37,370.15 257.77,365.70 250.32,361.00 243.03,356.04 235.92,350.83 228.99,345.39 222.25,339.71 215.70,333.81 209.36,327.68 203.24,321.34 197.34,314.80 191.66,308.06 186.21,301.13 181.01,294.02 176.05,286.73 171.34,279.28 166.89,271.67 162.70,263.92 158.78,256.02 155.13,248.00 151.76,239.86 148.67,231.60 145.86,223.25 143.34,214.80 141.10,206.28 139.16,197.68 137.52,189.02 136.17,180.31 135.12,171.56 134.37,162.78 133.92,153.98 133.77,145.17 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: square;' />
+<polyline points='69.24,145.17 69.24,154.07 69.24,162.97 69.24,171.87 69.24,180.77 69.24,189.67 69.24,198.57 69.24,207.47 69.24,216.37 69.24,225.27 69.24,234.17 69.24,243.07 69.24,251.97 69.24,260.87 69.24,269.77 69.24,278.67 69.24,287.57 69.24,296.47 69.24,305.37 69.24,314.28 69.24,323.18 69.24,332.08 69.24,340.98 69.24,349.88 69.24,358.78 69.24,367.68 69.24,376.58 69.24,385.48 69.24,394.38 69.24,403.28 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: square;' />
 <text x='42.28' y='218.59' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='39.15px' lengthAdjust='spacingAndGlyphs'>0 degrees</text>
 <text x='42.28' y='335.91' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='44.04px' lengthAdjust='spacingAndGlyphs'>90 degrees</text>
 <polyline points='66.50,215.56 69.24,215.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/coord-polar/inner-radius-with-all-axes.svg b/tests/testthat/_snaps/coord-polar/inner-radius-with-all-axes.svg
index 212100c87c..fc0a945481 100644
--- a/tests/testthat/_snaps/coord-polar/inner-radius-with-all-axes.svg
+++ b/tests/testthat/_snaps/coord-polar/inner-radius-with-all-axes.svg
@@ -83,7 +83,7 @@
 <polyline points='548.63,402.49 550.97,403.92 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='281.88,487.07 280.80,489.58 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='159.40,235.46 156.75,234.76 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='366.30,76.30 373.57,76.42 380.83,76.79 388.07,77.41 395.29,78.27 402.47,79.38 409.62,80.73 416.71,82.32 423.74,84.15 430.71,86.22 437.61,88.53 444.42,91.06 451.14,93.83 457.77,96.83 464.29,100.04 470.69,103.48 476.98,107.13 483.13,111.00 489.16,115.07 495.04,119.34 500.77,123.81 506.35,128.47 511.77,133.32 517.01,138.35 522.09,143.56 526.98,148.93 531.69,154.47 536.21,160.17 540.53,166.01 544.66,172.00 548.57,178.12 552.28,184.38 555.77,190.75 559.04,197.25 562.09,203.84 564.92,210.54 567.51,217.33 569.88,224.21 572.01,231.16 573.90,238.18 575.55,245.26 576.96,252.39 578.13,259.56 579.05,266.78 579.73,274.01 580.16,281.27 580.35,288.54 580.28,295.81 579.98,303.07 579.42,310.32 578.62,317.54 577.57,324.74 576.29,331.89 574.75,339.00 572.98,346.05 570.97,353.04 568.72,359.95 566.24,366.78 563.53,373.53 560.60,380.18 557.43,386.72 554.05,393.16 550.45,399.48 546.64,405.67 542.62,411.72 538.40,417.64 533.98,423.41 529.36,429.03 524.56,434.49 519.57,439.78 514.41,444.90 509.08,449.84 503.58,454.59 497.92,459.16 492.12,463.53 486.16,467.70 480.07,471.67 473.85,475.43 467.50,478.98 461.04,482.30 454.47,485.41 447.79,488.29 441.02,490.95 434.17,493.37 427.24,495.55 420.23,497.51 413.17,499.22 406.05,500.69 398.88,501.92 391.68,502.90 384.45,503.64 377.20,504.13 369.93,504.38 362.66,504.38 355.40,504.13 348.14,503.64 340.91,502.90 333.71,501.92 326.54,500.69 319.42,499.22 312.36,497.51 305.36,495.55 298.42,493.37 291.57,490.95 284.80,488.29 278.13,485.41 271.55,482.30 265.09,478.98 258.74,475.43 252.52,471.67 246.43,467.70 240.48,463.53 234.67,459.16 229.01,454.59 223.52,449.84 218.18,444.90 213.02,439.78 208.03,434.49 203.23,429.03 198.62,423.41 194.20,417.64 189.97,411.72 185.95,405.67 182.14,399.48 178.54,393.16 175.16,386.72 172.00,380.18 169.06,373.53 166.35,366.78 163.87,359.95 161.62,353.04 159.61,346.05 157.84,339.00 156.31,331.89 155.02,324.74 153.97,317.54 153.17,310.32 152.62,303.07 152.31,295.81 152.25,288.54 152.43,281.27 152.86,274.01 153.54,266.78 154.47,259.56 155.63,252.39 157.04,245.26 158.70,238.18 160.59,231.16 162.72,224.21 165.08,217.33 167.68,210.54 170.50,203.84 173.55,197.25 176.82,190.75 180.31,184.38 184.02,178.12 187.94,172.00 192.06,166.01 196.38,160.17 200.90,154.47 205.61,148.93 210.50,143.56 215.58,138.35 220.83,133.32 226.24,128.47 231.82,123.81 237.55,119.34 243.44,115.07 249.46,111.00 255.62,107.13 261.90,103.48 268.31,100.04 274.83,96.83 281.45,93.83 288.17,91.06 294.99,88.53 301.88,86.22 308.85,84.15 315.88,82.32 322.98,80.73 330.12,79.38 337.31,78.27 344.52,77.41 351.77,76.79 359.03,76.42 366.30,76.30 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: butt;' />
+<polyline points='366.30,76.30 373.57,76.42 380.83,76.79 388.07,77.41 395.29,78.27 402.47,79.38 409.62,80.73 416.71,82.32 423.74,84.15 430.71,86.22 437.61,88.53 444.42,91.06 451.14,93.83 457.77,96.83 464.29,100.04 470.69,103.48 476.98,107.13 483.13,111.00 489.16,115.07 495.04,119.34 500.77,123.81 506.35,128.47 511.77,133.32 517.01,138.35 522.09,143.56 526.98,148.93 531.69,154.47 536.21,160.17 540.53,166.01 544.66,172.00 548.57,178.12 552.28,184.38 555.77,190.75 559.04,197.25 562.09,203.84 564.92,210.54 567.51,217.33 569.88,224.21 572.01,231.16 573.90,238.18 575.55,245.26 576.96,252.39 578.13,259.56 579.05,266.78 579.73,274.01 580.16,281.27 580.35,288.54 580.28,295.81 579.98,303.07 579.42,310.32 578.62,317.54 577.57,324.74 576.29,331.89 574.75,339.00 572.98,346.05 570.97,353.04 568.72,359.95 566.24,366.78 563.53,373.53 560.60,380.18 557.43,386.72 554.05,393.16 550.45,399.48 546.64,405.67 542.62,411.72 538.40,417.64 533.98,423.41 529.36,429.03 524.56,434.49 519.57,439.78 514.41,444.90 509.08,449.84 503.58,454.59 497.92,459.16 492.12,463.53 486.16,467.70 480.07,471.67 473.85,475.43 467.50,478.98 461.04,482.30 454.47,485.41 447.79,488.29 441.02,490.95 434.17,493.37 427.24,495.55 420.23,497.51 413.17,499.22 406.05,500.69 398.88,501.92 391.68,502.90 384.45,503.64 377.20,504.13 369.93,504.38 362.66,504.38 355.40,504.13 348.14,503.64 340.91,502.90 333.71,501.92 326.54,500.69 319.42,499.22 312.36,497.51 305.36,495.55 298.42,493.37 291.57,490.95 284.80,488.29 278.13,485.41 271.55,482.30 265.09,478.98 258.74,475.43 252.52,471.67 246.43,467.70 240.48,463.53 234.67,459.16 229.01,454.59 223.52,449.84 218.18,444.90 213.02,439.78 208.03,434.49 203.23,429.03 198.62,423.41 194.20,417.64 189.97,411.72 185.95,405.67 182.14,399.48 178.54,393.16 175.16,386.72 172.00,380.18 169.06,373.53 166.35,366.78 163.87,359.95 161.62,353.04 159.61,346.05 157.84,339.00 156.31,331.89 155.02,324.74 153.97,317.54 153.17,310.32 152.62,303.07 152.31,295.81 152.25,288.54 152.43,281.27 152.86,274.01 153.54,266.78 154.47,259.56 155.63,252.39 157.04,245.26 158.70,238.18 160.59,231.16 162.72,224.21 165.08,217.33 167.68,210.54 170.50,203.84 173.55,197.25 176.82,190.75 180.31,184.38 184.02,178.12 187.94,172.00 192.06,166.01 196.38,160.17 200.90,154.47 205.61,148.93 210.50,143.56 215.58,138.35 220.83,133.32 226.24,128.47 231.82,123.81 237.55,119.34 243.44,115.07 249.46,111.00 255.62,107.13 261.90,103.48 268.31,100.04 274.83,96.83 281.45,93.83 288.17,91.06 294.99,88.53 301.88,86.22 308.85,84.15 315.88,82.32 322.98,80.73 330.12,79.38 337.31,78.27 344.52,77.41 351.77,76.79 359.03,76.42 366.30,76.30 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: square;' />
 <text x='407.00' y='250.26' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='417.89' y='322.85' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='345.81' y='345.08' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -92,8 +92,8 @@
 <polyline points='421.00,324.00 418.66,322.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='340.97,349.37 342.05,346.85 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='304.23,273.89 306.88,274.59 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='366.30,226.14 373.62,226.56 380.84,227.81 387.88,229.87 394.63,232.73 401.02,236.33 406.95,240.64 412.35,245.60 417.15,251.14 421.29,257.19 424.71,263.68 427.37,270.51 429.23,277.60 430.28,284.86 430.49,292.19 429.86,299.49 428.40,306.68 426.14,313.65 423.09,320.32 419.31,326.60 414.83,332.41 409.72,337.67 404.04,342.31 397.87,346.27 391.29,349.51 384.39,351.97 377.25,353.63 369.96,354.47 362.63,354.47 355.35,353.63 348.20,351.97 341.30,349.51 334.72,346.27 328.55,342.31 322.87,337.67 317.76,332.41 313.29,326.60 309.50,320.32 306.46,313.65 304.19,306.68 302.73,299.49 302.11,292.19 302.32,284.86 303.36,277.60 305.22,270.51 307.88,263.68 311.30,257.19 315.44,251.14 320.24,245.60 325.65,240.64 331.58,236.33 337.96,232.73 344.72,229.87 351.75,227.81 358.98,226.56 366.30,226.14 ' style='stroke-width: 1.07; stroke: #32CD32; stroke-linecap: butt;' />
-<polyline points='98.72,226.14 98.72,218.65 98.72,211.15 98.72,203.66 98.72,196.17 98.72,188.68 98.72,181.19 98.72,173.69 98.72,166.20 98.72,158.71 98.72,151.22 98.72,143.73 98.72,136.23 98.72,128.74 98.72,121.25 98.72,113.76 98.72,106.27 98.72,98.77 98.72,91.28 98.72,83.79 98.72,76.30 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: butt;' />
+<polyline points='366.30,226.14 373.62,226.56 380.84,227.81 387.88,229.87 394.63,232.73 401.02,236.33 406.95,240.64 412.35,245.60 417.15,251.14 421.29,257.19 424.71,263.68 427.37,270.51 429.23,277.60 430.28,284.86 430.49,292.19 429.86,299.49 428.40,306.68 426.14,313.65 423.09,320.32 419.31,326.60 414.83,332.41 409.72,337.67 404.04,342.31 397.87,346.27 391.29,349.51 384.39,351.97 377.25,353.63 369.96,354.47 362.63,354.47 355.35,353.63 348.20,351.97 341.30,349.51 334.72,346.27 328.55,342.31 322.87,337.67 317.76,332.41 313.29,326.60 309.50,320.32 306.46,313.65 304.19,306.68 302.73,299.49 302.11,292.19 302.32,284.86 303.36,277.60 305.22,270.51 307.88,263.68 311.30,257.19 315.44,251.14 320.24,245.60 325.65,240.64 331.58,236.33 337.96,232.73 344.72,229.87 351.75,227.81 358.98,226.56 366.30,226.14 ' style='stroke-width: 1.07; stroke: #32CD32; stroke-linecap: square;' />
+<polyline points='98.72,226.14 98.72,218.65 98.72,211.15 98.72,203.66 98.72,196.17 98.72,188.68 98.72,181.19 98.72,173.69 98.72,166.20 98.72,158.71 98.72,151.22 98.72,143.73 98.72,136.23 98.72,128.74 98.72,121.25 98.72,113.76 98.72,106.27 98.72,98.77 98.72,91.28 98.72,83.79 98.72,76.30 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: square;' />
 <text x='88.90' y='224.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='88.90' y='195.69' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='88.90' y='166.71' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
@@ -106,7 +106,7 @@
 <polyline points='95.99,134.70 98.72,134.70 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='95.99,105.72 98.72,105.72 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='95.99,76.73 98.72,76.73 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='633.87,226.14 633.87,218.65 633.87,211.15 633.87,203.66 633.87,196.17 633.87,188.68 633.87,181.19 633.87,173.69 633.87,166.20 633.87,158.71 633.87,151.22 633.87,143.73 633.87,136.23 633.87,128.74 633.87,121.25 633.87,113.76 633.87,106.27 633.87,98.77 633.87,91.28 633.87,83.79 633.87,76.30 ' style='stroke-width: 1.07; stroke: #DA70D6; stroke-linecap: butt;' />
+<polyline points='633.87,226.14 633.87,218.65 633.87,211.15 633.87,203.66 633.87,196.17 633.87,188.68 633.87,181.19 633.87,173.69 633.87,166.20 633.87,158.71 633.87,151.22 633.87,143.73 633.87,136.23 633.87,128.74 633.87,121.25 633.87,113.76 633.87,106.27 633.87,98.77 633.87,91.28 633.87,83.79 633.87,76.30 ' style='stroke-width: 1.07; stroke: #DA70D6; stroke-linecap: square;' />
 <polyline points='636.61,221.65 633.87,221.65 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='636.61,192.66 633.87,192.66 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='636.61,163.68 633.87,163.68 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/coord-polar/partial-with-all-axes.svg b/tests/testthat/_snaps/coord-polar/partial-with-all-axes.svg
index bc58f6429b..2cf7eac930 100644
--- a/tests/testthat/_snaps/coord-polar/partial-with-all-axes.svg
+++ b/tests/testthat/_snaps/coord-polar/partial-with-all-axes.svg
@@ -88,7 +88,7 @@
 <polyline points='462.10,342.52 464.80,342.99 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='432.84,429.34 435.27,430.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='378.94,503.43 380.88,505.36 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='377.96,76.30 385.15,83.73 392.07,91.40 398.73,99.31 405.12,107.44 411.22,115.78 417.04,124.33 422.56,133.07 427.78,141.99 432.69,151.08 437.29,160.34 441.57,169.75 445.52,179.30 449.15,188.98 452.45,198.78 455.40,208.68 458.02,218.68 460.30,228.76 462.23,238.92 463.81,249.13 465.04,259.40 465.92,269.70 466.45,280.02 466.63,290.36 466.45,300.69 465.92,311.01 465.04,321.31 463.81,331.58 462.23,341.79 460.30,351.95 458.02,362.03 455.40,372.03 452.45,381.93 449.15,391.73 445.52,401.41 441.57,410.96 437.29,420.37 432.69,429.63 427.78,438.72 422.56,447.65 417.04,456.38 411.22,464.93 405.12,473.27 398.73,481.40 392.07,489.31 385.15,496.98 377.96,504.41 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: butt;' />
+<polyline points='377.96,76.30 385.15,83.73 392.07,91.40 398.73,99.31 405.12,107.44 411.22,115.78 417.04,124.33 422.56,133.07 427.78,141.99 432.69,151.08 437.29,160.34 441.57,169.75 445.52,179.30 449.15,188.98 452.45,198.78 455.40,208.68 458.02,218.68 460.30,228.76 462.23,238.92 463.81,249.13 465.04,259.40 465.92,269.70 466.45,280.02 466.63,290.36 466.45,300.69 465.92,311.01 465.04,321.31 463.81,331.58 462.23,341.79 460.30,351.95 458.02,362.03 455.40,372.03 452.45,381.93 449.15,391.73 445.52,401.41 441.57,410.96 437.29,420.37 432.69,429.63 427.78,438.72 422.56,447.65 417.04,456.38 411.22,464.93 405.12,473.27 398.73,481.40 392.07,489.31 385.15,496.98 377.96,504.41 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: square;' />
 <text x='228.70' y='237.62' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='242.27' y='258.51' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='249.10' y='282.59' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
@@ -101,8 +101,8 @@
 <polyline points='253.36,306.00 250.67,305.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='244.59,332.05 242.15,330.79 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='228.42,354.28 226.47,352.35 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='228.12,226.14 235.40,234.35 241.63,243.37 246.72,253.08 250.61,263.34 253.24,273.99 254.56,284.87 254.56,295.84 253.24,306.73 250.61,317.37 246.72,327.63 241.63,337.34 235.40,346.36 228.12,354.57 ' style='stroke-width: 1.07; stroke: #32CD32; stroke-linecap: butt;' />
-<polyline points='228.12,226.14 235.62,218.65 243.11,211.15 250.60,203.66 258.09,196.17 265.58,188.68 273.08,181.19 280.57,173.69 288.06,166.20 295.55,158.71 303.04,151.22 310.54,143.73 318.03,136.23 325.52,128.74 333.01,121.25 340.50,113.76 348.00,106.27 355.49,98.77 362.98,91.28 370.47,83.79 377.96,76.30 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: butt;' />
+<polyline points='228.12,226.14 235.40,234.35 241.63,243.37 246.72,253.08 250.61,263.34 253.24,273.99 254.56,284.87 254.56,295.84 253.24,306.73 250.61,317.37 246.72,327.63 241.63,337.34 235.40,346.36 228.12,354.57 ' style='stroke-width: 1.07; stroke: #32CD32; stroke-linecap: square;' />
+<polyline points='228.12,226.14 235.62,218.65 243.11,211.15 250.60,203.66 258.09,196.17 265.58,188.68 273.08,181.19 280.57,173.69 288.06,166.20 295.55,158.71 303.04,151.22 310.54,143.73 318.03,136.23 325.52,128.74 333.01,121.25 340.50,113.76 348.00,106.27 355.49,98.77 362.98,91.28 370.47,83.79 377.96,76.30 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: square;' />
 <text x='241.27' y='206.02' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='275.25' y='172.04' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='309.22' y='138.06' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -111,7 +111,7 @@
 <polyline points='276.80,173.59 278.73,175.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='310.77,139.61 312.71,141.55 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='344.75,105.64 346.69,107.57 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='228.12,354.57 235.62,362.06 243.11,369.56 250.60,377.05 258.09,384.54 265.58,392.03 273.08,399.52 280.57,407.02 288.06,414.51 295.55,422.00 303.04,429.49 310.54,436.98 318.03,444.48 325.52,451.97 333.01,459.46 340.50,466.95 348.00,474.44 355.49,481.94 362.98,489.43 370.47,496.92 377.96,504.41 ' style='stroke-width: 1.07; stroke: #DA70D6; stroke-linecap: butt;' />
+<polyline points='228.12,354.57 235.62,362.06 243.11,369.56 250.60,377.05 258.09,384.54 265.58,392.03 273.08,399.52 280.57,407.02 288.06,414.51 295.55,422.00 303.04,429.49 310.54,436.98 318.03,444.48 325.52,451.97 333.01,459.46 340.50,466.95 348.00,474.44 355.49,481.94 362.98,489.43 370.47,496.92 377.96,504.41 ' style='stroke-width: 1.07; stroke: #DA70D6; stroke-linecap: square;' />
 <polyline points='242.82,373.14 244.75,371.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='276.80,407.12 278.73,405.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='310.77,441.10 312.71,439.16 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/guides/axis-guides-with-capped-ends.svg b/tests/testthat/_snaps/guides/axis-guides-with-capped-ends.svg
index 393ffb017b..f50e7c4888 100644
--- a/tests/testthat/_snaps/guides/axis-guides-with-capped-ends.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-with-capped-ends.svg
@@ -75,14 +75,14 @@
 <circle cx='187.90' cy='464.30' r='1.95' style='stroke-width: 0.71; fill: #000000;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<polyline points='37.69,35.60 694.91,35.60 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='37.69,35.60 694.91,35.60 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='168.90,32.86 168.90,35.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='380.02,32.86 380.02,35.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='591.14,32.86 591.14,35.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='168.90' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='380.02' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='591.14' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
-<polyline points='37.69,545.11 37.69,141.95 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='37.69,545.11 37.69,141.95 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='32.76' y='491.59' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='32.76' y='376.05' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='32.76' y='260.51' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -91,7 +91,7 @@
 <polyline points='34.95,373.02 37.69,373.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='34.95,257.48 37.69,257.48 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='34.95,141.95 37.69,141.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='694.91,488.56 694.91,35.60 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='694.91,488.56 694.91,35.60 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='697.65,488.56 694.91,488.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='697.65,373.02 694.91,373.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='697.65,257.48 694.91,257.48 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
@@ -100,7 +100,7 @@
 <text x='699.84' y='376.05' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='699.84' y='260.51' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <text x='699.84' y='144.97' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>400</text>
-<polyline points='168.90,545.11 591.14,545.11 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='168.90,545.11 591.14,545.11 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='168.90,547.85 168.90,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='380.02,547.85 380.02,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='591.14,547.85 591.14,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/guides/guide-axis-theta-in-cartesian-coordinates.svg b/tests/testthat/_snaps/guides/guide-axis-theta-in-cartesian-coordinates.svg
index f9c50c7388..65c9060d2d 100644
--- a/tests/testthat/_snaps/guides/guide-axis-theta-in-cartesian-coordinates.svg
+++ b/tests/testthat/_snaps/guides/guide-axis-theta-in-cartesian-coordinates.svg
@@ -88,7 +88,7 @@
 <polyline points='258.08,35.60 258.08,32.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='409.33,35.60 409.33,32.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='560.58,35.60 560.58,32.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='32.79,35.60 699.80,35.60 ' style='stroke-width: 1.07; stroke: #32CD32; stroke-linecap: butt;' />
+<polyline points='32.79,35.60 699.80,35.60 ' style='stroke-width: 1.07; stroke: #32CD32; stroke-linecap: square;' />
 <text x='27.86' y='532.86' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='27.86' y='434.31' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='27.86' y='335.76' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
@@ -101,7 +101,7 @@
 <polyline points='32.79,234.18 30.05,234.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='32.79,135.63 30.05,135.63 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='32.79,37.08 30.05,37.08 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='32.79,545.11 32.79,35.60 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: butt;' />
+<polyline points='32.79,545.11 32.79,35.60 ' style='stroke-width: 1.07; stroke: #1E90FF; stroke-linecap: square;' />
 <text x='704.73' y='532.86' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='704.73' y='434.31' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='704.73' y='335.76' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
@@ -114,7 +114,7 @@
 <polyline points='699.80,234.18 702.54,234.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='699.80,135.63 702.54,135.63 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='699.80,37.08 702.54,37.08 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,545.11 699.80,35.60 ' style='stroke-width: 1.07; stroke: #DA70D6; stroke-linecap: butt;' />
+<polyline points='699.80,545.11 699.80,35.60 ' style='stroke-width: 1.07; stroke: #DA70D6; stroke-linecap: square;' />
 <text x='106.82' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='258.08' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='409.33' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -123,7 +123,7 @@
 <polyline points='258.08,545.11 258.08,547.85 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='409.33,545.11 409.33,547.85 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='560.58,545.11 560.58,547.85 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='32.79,545.11 699.80,545.11 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: butt;' />
+<polyline points='32.79,545.11 699.80,545.11 ' style='stroke-width: 1.07; stroke: #FF6347; stroke-linecap: square;' />
 <text x='366.30' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='20.18px' lengthAdjust='spacingAndGlyphs'>disp</text>
 <text transform='translate(13.05,290.36) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>mpg</text>
 <text x='32.79' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='242.92px' lengthAdjust='spacingAndGlyphs'>guide_axis_theta in cartesian coordinates</text>
diff --git a/tests/testthat/_snaps/guides/guide-axis-theta-with-angle-adapting-to-theta.svg b/tests/testthat/_snaps/guides/guide-axis-theta-with-angle-adapting-to-theta.svg
index b6cfa798fc..5d9f41ac4e 100644
--- a/tests/testthat/_snaps/guides/guide-axis-theta-with-angle-adapting-to-theta.svg
+++ b/tests/testthat/_snaps/guides/guide-axis-theta-with-angle-adapting-to-theta.svg
@@ -136,7 +136,7 @@
 <polyline points='199.98,166.76 197.75,165.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='254.05,113.57 252.51,111.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='323.28,82.58 322.62,79.92 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='374.75,76.30 382.02,76.42 389.28,76.79 396.53,77.41 403.74,78.27 410.93,79.38 418.07,80.73 425.17,82.32 432.20,84.15 439.17,86.22 446.06,88.53 452.88,91.06 459.60,93.83 466.22,96.83 472.74,100.04 479.15,103.48 485.43,107.13 491.59,111.00 497.61,115.07 503.50,119.34 509.23,123.81 514.81,128.47 520.22,133.32 525.47,138.35 530.55,143.56 535.44,148.93 540.15,154.47 544.67,160.17 548.99,166.01 553.11,172.00 557.03,178.12 560.73,184.38 564.23,190.75 567.50,197.25 570.55,203.84 573.37,210.54 575.97,217.33 578.33,224.21 580.46,231.16 582.35,238.18 584.01,245.26 585.42,252.39 586.58,259.56 587.51,266.78 588.19,274.01 588.62,281.27 588.80,288.54 588.74,295.81 588.43,303.07 587.88,310.32 587.08,317.54 586.03,324.74 584.74,331.89 583.21,339.00 581.44,346.05 579.43,353.04 577.18,359.95 574.70,366.78 571.99,373.53 569.05,380.18 565.89,386.72 562.51,393.16 558.91,399.48 555.10,405.67 551.08,411.72 546.85,417.64 542.43,423.41 537.82,429.03 533.02,434.49 528.03,439.78 522.87,444.90 517.53,449.84 512.04,454.59 506.38,459.16 500.57,463.53 494.62,467.70 488.53,471.67 482.31,475.43 475.96,478.98 469.50,482.30 462.92,485.41 456.25,488.29 449.48,490.95 442.63,493.37 435.69,495.55 428.69,497.51 421.63,499.22 414.51,500.69 407.34,501.92 400.14,502.90 392.91,503.64 385.65,504.13 378.39,504.38 371.12,504.38 363.85,504.13 356.60,503.64 349.37,502.90 342.16,501.92 335.00,500.69 327.88,499.22 320.82,497.51 313.81,495.55 306.88,493.37 300.02,490.95 293.26,488.29 286.58,485.41 280.01,482.30 273.55,478.98 267.20,475.43 260.98,471.67 254.89,467.70 248.93,463.53 243.13,459.16 237.47,454.59 231.97,449.84 226.64,444.90 221.48,439.78 216.49,434.49 211.69,429.03 207.07,423.41 202.65,417.64 198.43,411.72 194.41,405.67 190.60,399.48 187.00,393.16 183.62,386.72 180.45,380.18 177.52,373.53 174.80,366.78 172.32,359.95 170.08,353.04 168.07,346.05 166.30,339.00 164.76,331.89 163.48,324.74 162.43,317.54 161.63,310.32 161.07,303.07 160.76,295.81 160.70,288.54 160.89,281.27 161.32,274.01 162.00,266.78 162.92,259.56 164.09,252.39 165.50,245.26 167.15,238.18 169.04,231.16 171.17,224.21 173.54,217.33 176.13,210.54 178.96,203.84 182.01,197.25 185.28,190.75 188.77,184.38 192.48,178.12 196.39,172.00 200.51,166.01 204.84,160.17 209.36,154.47 214.07,148.93 218.96,143.56 224.04,138.35 229.28,133.32 234.70,128.47 240.28,123.81 246.01,119.34 251.89,115.07 257.92,111.00 264.07,107.13 270.36,103.48 276.76,100.04 283.28,96.83 289.91,93.83 296.63,91.06 303.44,88.53 310.34,86.22 317.31,84.15 324.34,82.32 331.43,80.73 338.58,79.38 345.76,78.27 352.98,77.41 360.22,76.79 367.48,76.42 374.75,76.30 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='374.75,76.30 382.02,76.42 389.28,76.79 396.53,77.41 403.74,78.27 410.93,79.38 418.07,80.73 425.17,82.32 432.20,84.15 439.17,86.22 446.06,88.53 452.88,91.06 459.60,93.83 466.22,96.83 472.74,100.04 479.15,103.48 485.43,107.13 491.59,111.00 497.61,115.07 503.50,119.34 509.23,123.81 514.81,128.47 520.22,133.32 525.47,138.35 530.55,143.56 535.44,148.93 540.15,154.47 544.67,160.17 548.99,166.01 553.11,172.00 557.03,178.12 560.73,184.38 564.23,190.75 567.50,197.25 570.55,203.84 573.37,210.54 575.97,217.33 578.33,224.21 580.46,231.16 582.35,238.18 584.01,245.26 585.42,252.39 586.58,259.56 587.51,266.78 588.19,274.01 588.62,281.27 588.80,288.54 588.74,295.81 588.43,303.07 587.88,310.32 587.08,317.54 586.03,324.74 584.74,331.89 583.21,339.00 581.44,346.05 579.43,353.04 577.18,359.95 574.70,366.78 571.99,373.53 569.05,380.18 565.89,386.72 562.51,393.16 558.91,399.48 555.10,405.67 551.08,411.72 546.85,417.64 542.43,423.41 537.82,429.03 533.02,434.49 528.03,439.78 522.87,444.90 517.53,449.84 512.04,454.59 506.38,459.16 500.57,463.53 494.62,467.70 488.53,471.67 482.31,475.43 475.96,478.98 469.50,482.30 462.92,485.41 456.25,488.29 449.48,490.95 442.63,493.37 435.69,495.55 428.69,497.51 421.63,499.22 414.51,500.69 407.34,501.92 400.14,502.90 392.91,503.64 385.65,504.13 378.39,504.38 371.12,504.38 363.85,504.13 356.60,503.64 349.37,502.90 342.16,501.92 335.00,500.69 327.88,499.22 320.82,497.51 313.81,495.55 306.88,493.37 300.02,490.95 293.26,488.29 286.58,485.41 280.01,482.30 273.55,478.98 267.20,475.43 260.98,471.67 254.89,467.70 248.93,463.53 243.13,459.16 237.47,454.59 231.97,449.84 226.64,444.90 221.48,439.78 216.49,434.49 211.69,429.03 207.07,423.41 202.65,417.64 198.43,411.72 194.41,405.67 190.60,399.48 187.00,393.16 183.62,386.72 180.45,380.18 177.52,373.53 174.80,366.78 172.32,359.95 170.08,353.04 168.07,346.05 166.30,339.00 164.76,331.89 163.48,324.74 162.43,317.54 161.63,310.32 161.07,303.07 160.76,295.81 160.70,288.54 160.89,281.27 161.32,274.01 162.00,266.78 162.92,259.56 164.09,252.39 165.50,245.26 167.15,238.18 169.04,231.16 171.17,224.21 173.54,217.33 176.13,210.54 178.96,203.84 182.01,197.25 185.28,190.75 188.77,184.38 192.48,178.12 196.39,172.00 200.51,166.01 204.84,160.17 209.36,154.47 214.07,148.93 218.96,143.56 224.04,138.35 229.28,133.32 234.70,128.47 240.28,123.81 246.01,119.34 251.89,115.07 257.92,111.00 264.07,107.13 270.36,103.48 276.76,100.04 283.28,96.83 289.91,93.83 296.63,91.06 303.44,88.53 310.34,86.22 317.31,84.15 324.34,82.32 331.43,80.73 338.58,79.38 345.76,78.27 352.98,77.41 360.22,76.79 367.48,76.42 374.75,76.30 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text transform='translate(411.77,195.16) rotate(-430)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>75</text>
 <text transform='translate(442.64,214.04) rotate(-410)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text transform='translate(464.99,242.50) rotate(-390)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>125</text>
@@ -171,8 +171,8 @@
 <polyline points='287.37,228.56 289.61,230.14 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='314.40,201.96 315.95,204.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='349.02,186.47 349.67,189.13 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='410.56,189.50 417.32,192.15 423.88,195.27 430.21,198.82 436.29,202.79 442.09,207.16 447.57,211.92 452.72,217.03 457.51,222.49 461.92,228.25 465.93,234.31 469.52,240.62 472.68,247.16 475.38,253.90 477.62,260.80 479.39,267.84 480.67,274.99 481.47,282.20 481.78,289.46 481.59,296.72 480.92,303.94 479.75,311.11 478.10,318.18 475.98,325.12 473.39,331.91 470.34,338.50 466.86,344.87 462.95,350.99 458.64,356.83 453.94,362.36 448.88,367.56 443.47,372.41 437.75,376.88 431.74,380.95 425.47,384.61 418.96,387.83 412.25,390.60 405.37,392.91 398.34,394.75 391.21,396.11 384.00,396.98 376.75,397.37 369.49,397.25 362.26,396.65 355.08,395.56 347.99,393.98 341.03,391.93 334.22,389.41 327.60,386.44 321.19,383.02 315.03,379.17 309.15,374.92 303.57,370.28 298.31,365.27 293.41,359.91 288.88,354.24 284.75,348.27 281.03,342.04 277.74,335.56 274.90,328.88 272.52,322.02 270.61,315.02 269.17,307.90 268.23,300.70 267.77,293.46 267.80,286.20 268.33,278.96 269.35,271.77 270.85,264.67 272.83,257.68 275.28,250.85 278.19,244.19 281.54,237.75 285.32,231.56 289.51,225.63 294.10,220.00 299.05,214.69 304.36,209.73 309.99,205.15 315.91,200.95 322.11,197.17 328.55,193.81 335.20,190.90 342.03,188.45 349.02,186.47 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='107.18,183.33 107.18,175.68 107.18,168.04 107.18,160.39 107.18,152.75 107.18,145.10 107.18,137.46 107.18,129.81 107.18,122.17 107.18,114.52 107.18,106.88 107.18,99.23 107.18,91.59 107.18,83.94 107.18,76.30 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='410.56,189.50 417.32,192.15 423.88,195.27 430.21,198.82 436.29,202.79 442.09,207.16 447.57,211.92 452.72,217.03 457.51,222.49 461.92,228.25 465.93,234.31 469.52,240.62 472.68,247.16 475.38,253.90 477.62,260.80 479.39,267.84 480.67,274.99 481.47,282.20 481.78,289.46 481.59,296.72 480.92,303.94 479.75,311.11 478.10,318.18 475.98,325.12 473.39,331.91 470.34,338.50 466.86,344.87 462.95,350.99 458.64,356.83 453.94,362.36 448.88,367.56 443.47,372.41 437.75,376.88 431.74,380.95 425.47,384.61 418.96,387.83 412.25,390.60 405.37,392.91 398.34,394.75 391.21,396.11 384.00,396.98 376.75,397.37 369.49,397.25 362.26,396.65 355.08,395.56 347.99,393.98 341.03,391.93 334.22,389.41 327.60,386.44 321.19,383.02 315.03,379.17 309.15,374.92 303.57,370.28 298.31,365.27 293.41,359.91 288.88,354.24 284.75,348.27 281.03,342.04 277.74,335.56 274.90,328.88 272.52,322.02 270.61,315.02 269.17,307.90 268.23,300.70 267.77,293.46 267.80,286.20 268.33,278.96 269.35,271.77 270.85,264.67 272.83,257.68 275.28,250.85 278.19,244.19 281.54,237.75 285.32,231.56 289.51,225.63 294.10,220.00 299.05,214.69 304.36,209.73 309.99,205.15 315.91,200.95 322.11,197.17 328.55,193.81 335.20,190.90 342.03,188.45 349.02,186.47 ' style='stroke-width: 1.07; stroke-linecap: square;' />
+<polyline points='107.18,183.33 107.18,175.68 107.18,168.04 107.18,160.39 107.18,152.75 107.18,145.10 107.18,137.46 107.18,129.81 107.18,122.17 107.18,114.52 107.18,106.88 107.18,99.23 107.18,91.59 107.18,83.94 107.18,76.30 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='97.36' y='183.15' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='97.36' y='162.44' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='97.36' y='141.74' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
diff --git a/tests/testthat/_snaps/guides/left-aligned-legend-key.svg b/tests/testthat/_snaps/guides/left-aligned-legend-key.svg
index fc84b274ea..f591bfa25f 100644
--- a/tests/testthat/_snaps/guides/left-aligned-legend-key.svg
+++ b/tests/testthat/_snaps/guides/left-aligned-legend-key.svg
@@ -80,7 +80,7 @@
 <circle cx='140.92' cy='312.40' r='1.95' style='stroke-width: 0.71; stroke: #F8766D; fill: #F8766D;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<polyline points='32.79,545.11 32.79,51.02 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='32.79,545.11 32.79,51.02 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='27.86' y='533.33' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='27.86' y='437.76' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='27.86' y='342.19' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
@@ -93,7 +93,7 @@
 <polyline points='30.05,243.59 32.79,243.59 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='30.05,148.02 32.79,148.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='30.05,52.46 32.79,52.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='32.79,545.11 714.52,545.11 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='32.79,545.11 714.52,545.11 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='108.46,547.85 108.46,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='263.05,547.85 263.05,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='417.64,547.85 417.64,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/guides/stacked-axes.svg b/tests/testthat/_snaps/guides/stacked-axes.svg
index 9ed86845f6..cc3bf12f57 100644
--- a/tests/testthat/_snaps/guides/stacked-axes.svg
+++ b/tests/testthat/_snaps/guides/stacked-axes.svg
@@ -75,21 +75,21 @@
 <circle cx='197.16' cy='455.68' r='1.95' style='stroke-width: 0.71; fill: #000000;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<polyline points='60.04,63.75 659.96,63.75 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='60.04,63.75 659.96,63.75 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='179.81,61.01 179.81,63.75 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='372.53,61.01 372.53,63.75 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='565.24,61.01 565.24,63.75 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='179.81' y='58.81' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='372.53' y='58.81' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='565.24' y='58.81' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
-<polyline points='179.81,48.19 565.24,48.19 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='179.81,48.19 565.24,48.19 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='179.81,45.45 179.81,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='372.53,45.45 372.53,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='565.24,45.45 565.24,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='179.81' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='372.53' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='565.24' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
-<polyline points='60.04,529.56 60.04,63.75 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='60.04,529.56 60.04,63.75 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='55.11' y='480.89' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='55.11' y='375.26' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='55.11' y='269.63' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -98,7 +98,7 @@
 <polyline points='57.30,372.23 60.04,372.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='57.30,266.60 60.04,266.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='57.30,160.97 60.04,160.97 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='37.69,477.86 37.69,160.97 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='37.69,477.86 37.69,160.97 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='32.76' y='480.89' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='32.76' y='375.26' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='32.76' y='269.63' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -107,7 +107,7 @@
 <polyline points='34.95,372.23 37.69,372.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='34.95,266.60 37.69,266.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='34.95,160.97 37.69,160.97 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='659.96,529.56 659.96,63.75 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='659.96,529.56 659.96,63.75 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='662.70,477.86 659.96,477.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='662.70,372.23 659.96,372.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='662.70,266.60 659.96,266.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
@@ -116,7 +116,7 @@
 <text x='664.89' y='375.26' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='664.89' y='269.63' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <text x='664.89' y='164.00' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>400</text>
-<polyline points='682.31,477.86 682.31,160.97 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='682.31,477.86 682.31,160.97 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='685.05,477.86 682.31,477.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='685.05,372.23 682.31,372.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='685.05,266.60 682.31,266.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
@@ -125,14 +125,14 @@
 <text x='687.24' y='375.26' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='687.24' y='269.63' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <text x='687.24' y='164.00' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>400</text>
-<polyline points='60.04,529.56 659.96,529.56 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='60.04,529.56 659.96,529.56 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='179.81,532.30 179.81,529.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='372.53,532.30 372.53,529.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='565.24,532.30 565.24,529.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='179.81' y='540.55' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='372.53' y='540.55' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='565.24' y='540.55' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
-<polyline points='179.81,545.11 565.24,545.11 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='179.81,545.11 565.24,545.11 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='179.81,547.85 179.81,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='372.53,547.85 372.53,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='565.24,547.85 565.24,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/guides/stacked-radial-axes.svg b/tests/testthat/_snaps/guides/stacked-radial-axes.svg
index 18609a9a74..82f510e939 100644
--- a/tests/testthat/_snaps/guides/stacked-radial-axes.svg
+++ b/tests/testthat/_snaps/guides/stacked-radial-axes.svg
@@ -77,29 +77,29 @@
 <polyline points='607.76,283.27 610.47,283.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='335.36,494.02 335.09,496.74 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='109.43,234.07 106.69,233.96 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='537.33,67.12 543.24,73.23 548.94,79.54 554.42,86.04 559.68,92.72 564.71,99.57 569.50,106.60 574.05,113.78 578.36,121.11 582.41,128.58 586.21,136.18 589.75,143.91 593.03,151.76 596.03,159.71 598.77,167.76 601.23,175.90 603.42,184.11 605.32,192.40 606.95,200.74 608.29,209.14 609.34,217.58 610.11,226.04 610.59,234.53 610.78,243.03 610.68,251.53 610.30,260.02 609.63,268.50 608.67,276.95 607.42,285.36 605.90,293.72 604.08,302.03 601.99,310.27 599.62,318.43 596.98,326.51 594.06,334.50 590.87,342.38 587.42,350.15 583.71,357.80 579.74,365.31 575.51,372.69 571.04,379.92 566.33,387.00 561.38,393.91 556.20,400.65 550.79,407.21 545.16,413.58 539.32,419.76 533.28,425.74 527.03,431.51 520.60,437.06 513.98,442.40 507.18,447.50 500.21,452.37 493.08,457.01 485.80,461.40 478.37,465.54 470.81,469.42 463.12,473.05 455.32,476.41 447.40,479.51 439.38,482.34 431.27,484.89 423.08,487.17 414.82,489.17 406.49,490.88 398.11,492.32 389.69,493.47 381.23,494.33 372.75,494.91 364.25,495.20 355.75,495.20 347.25,494.91 338.77,494.33 330.31,493.47 321.89,492.32 313.51,490.88 305.18,489.17 296.92,487.17 288.73,484.89 280.62,482.34 272.60,479.51 264.68,476.41 256.88,473.05 249.19,469.42 241.63,465.54 234.20,461.40 226.92,457.01 219.79,452.37 212.82,447.50 206.02,442.40 199.40,437.06 192.97,431.51 186.72,425.74 180.68,419.76 174.84,413.58 169.21,407.21 163.80,400.65 158.62,393.91 153.67,387.00 148.96,379.92 144.49,372.69 140.26,365.31 136.29,357.80 132.58,350.15 129.13,342.38 125.94,334.50 123.02,326.51 120.38,318.43 118.01,310.27 115.92,302.03 114.10,293.72 112.58,285.36 111.33,276.95 110.37,268.50 109.70,260.02 109.32,251.53 109.22,243.03 109.41,234.53 109.89,226.04 110.66,217.58 111.71,209.14 113.05,200.74 114.68,192.40 116.58,184.11 118.77,175.90 121.23,167.76 123.97,159.71 126.97,151.76 130.25,143.91 133.79,136.18 137.59,128.58 141.64,121.11 145.95,113.78 150.50,106.60 155.29,99.57 160.32,92.72 165.58,86.04 171.06,79.54 176.76,73.23 182.67,67.12 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='537.33,67.12 543.24,73.23 548.94,79.54 554.42,86.04 559.68,92.72 564.71,99.57 569.50,106.60 574.05,113.78 578.36,121.11 582.41,128.58 586.21,136.18 589.75,143.91 593.03,151.76 596.03,159.71 598.77,167.76 601.23,175.90 603.42,184.11 605.32,192.40 606.95,200.74 608.29,209.14 609.34,217.58 610.11,226.04 610.59,234.53 610.78,243.03 610.68,251.53 610.30,260.02 609.63,268.50 608.67,276.95 607.42,285.36 605.90,293.72 604.08,302.03 601.99,310.27 599.62,318.43 596.98,326.51 594.06,334.50 590.87,342.38 587.42,350.15 583.71,357.80 579.74,365.31 575.51,372.69 571.04,379.92 566.33,387.00 561.38,393.91 556.20,400.65 550.79,407.21 545.16,413.58 539.32,419.76 533.28,425.74 527.03,431.51 520.60,437.06 513.98,442.40 507.18,447.50 500.21,452.37 493.08,457.01 485.80,461.40 478.37,465.54 470.81,469.42 463.12,473.05 455.32,476.41 447.40,479.51 439.38,482.34 431.27,484.89 423.08,487.17 414.82,489.17 406.49,490.88 398.11,492.32 389.69,493.47 381.23,494.33 372.75,494.91 364.25,495.20 355.75,495.20 347.25,494.91 338.77,494.33 330.31,493.47 321.89,492.32 313.51,490.88 305.18,489.17 296.92,487.17 288.73,484.89 280.62,482.34 272.60,479.51 264.68,476.41 256.88,473.05 249.19,469.42 241.63,465.54 234.20,461.40 226.92,457.01 219.79,452.37 212.82,447.50 206.02,442.40 199.40,437.06 192.97,431.51 186.72,425.74 180.68,419.76 174.84,413.58 169.21,407.21 163.80,400.65 158.62,393.91 153.67,387.00 148.96,379.92 144.49,372.69 140.26,365.31 136.29,357.80 132.58,350.15 129.13,342.38 125.94,334.50 123.02,326.51 120.38,318.43 118.01,310.27 115.92,302.03 114.10,293.72 112.58,285.36 111.33,276.95 110.37,268.50 109.70,260.02 109.32,251.53 109.22,243.03 109.41,234.53 109.89,226.04 110.66,217.58 111.71,209.14 113.05,200.74 114.68,192.40 116.58,184.11 118.77,175.90 121.23,167.76 123.97,159.71 126.97,151.76 130.25,143.91 133.79,136.18 137.59,128.58 141.64,121.11 145.95,113.78 150.50,106.60 155.29,99.57 160.32,92.72 165.58,86.04 171.06,79.54 176.76,73.23 182.67,67.12 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='634.34' y='290.94' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='331.99' y='526.92' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='82.47' y='235.86' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <polyline points='629.56,286.68 632.26,287.10 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='333.20,515.97 332.93,518.70 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='87.39,233.16 84.65,233.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='629.56,286.68 627.96,295.82 626.06,304.91 623.85,313.92 621.34,322.86 618.52,331.70 615.40,340.44 611.99,349.07 608.28,357.58 604.29,365.96 600.02,374.20 595.47,382.29 590.64,390.22 585.55,397.98 580.20,405.56 574.59,412.95 568.74,420.16 562.64,427.15 556.31,433.94 549.75,440.51 542.97,446.85 535.98,452.95 528.79,458.82 521.40,464.43 513.83,469.80 506.07,474.90 498.15,479.73 490.07,484.29 481.84,488.58 473.46,492.58 464.96,496.30 456.33,499.72 447.59,502.85 438.75,505.68 429.82,508.21 420.81,510.43 411.73,512.34 402.59,513.95 393.40,515.24 384.17,516.22 374.91,516.89 365.64,517.23 356.36,517.27 347.08,516.99 337.82,516.39 328.58,515.48 319.38,514.25 310.23,512.72 301.13,510.87 292.11,508.71 283.16,506.25 274.30,503.48 265.54,500.42 256.89,497.06 248.36,493.41 239.95,489.46 231.69,485.24 223.57,480.74 215.62,475.96 207.83,470.92 200.21,465.61 192.78,460.05 185.55,454.23 178.51,448.18 171.69,441.89 165.08,435.37 158.70,428.63 152.55,421.68 146.65,414.52 140.98,407.16 135.58,399.62 130.43,391.90 125.55,384.01 120.94,375.95 116.60,367.74 112.55,359.39 108.78,350.91 105.31,342.31 102.13,333.59 99.24,324.77 96.66,315.85 94.39,306.85 92.42,297.78 90.76,288.65 89.41,279.47 88.38,270.25 87.66,260.99 87.25,251.72 87.16,242.44 87.39,233.16 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='629.56,286.68 627.96,295.82 626.06,304.91 623.85,313.92 621.34,322.86 618.52,331.70 615.40,340.44 611.99,349.07 608.28,357.58 604.29,365.96 600.02,374.20 595.47,382.29 590.64,390.22 585.55,397.98 580.20,405.56 574.59,412.95 568.74,420.16 562.64,427.15 556.31,433.94 549.75,440.51 542.97,446.85 535.98,452.95 528.79,458.82 521.40,464.43 513.83,469.80 506.07,474.90 498.15,479.73 490.07,484.29 481.84,488.58 473.46,492.58 464.96,496.30 456.33,499.72 447.59,502.85 438.75,505.68 429.82,508.21 420.81,510.43 411.73,512.34 402.59,513.95 393.40,515.24 384.17,516.22 374.91,516.89 365.64,517.23 356.36,517.27 347.08,516.99 337.82,516.39 328.58,515.48 319.38,514.25 310.23,512.72 301.13,510.87 292.11,508.71 283.16,506.25 274.30,503.48 265.54,500.42 256.89,497.06 248.36,493.41 239.95,489.46 231.69,485.24 223.57,480.74 215.62,475.96 207.83,470.92 200.21,465.61 192.78,460.05 185.55,454.23 178.51,448.18 171.69,441.89 165.08,435.37 158.70,428.63 152.55,421.68 146.65,414.52 140.98,407.16 135.58,399.62 130.43,391.90 125.55,384.01 120.94,375.95 116.60,367.74 112.55,359.39 108.78,350.91 105.31,342.31 102.13,333.59 99.24,324.77 96.66,315.85 94.39,306.85 92.42,297.78 90.76,288.65 89.41,279.47 88.38,270.25 87.66,260.99 87.25,251.72 87.16,242.44 87.39,233.16 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='479.10' y='265.65' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='348.89' y='364.34' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='239.64' y='242.62' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <polyline points='483.88,263.86 481.17,263.43 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='347.68,369.23 347.95,366.51 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='234.72,239.26 237.45,239.37 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.67,155.78 454.51,162.04 459.91,168.68 464.85,175.68 469.30,182.99 473.24,190.59 476.65,198.45 479.52,206.51 481.83,214.76 483.57,223.14 484.73,231.62 485.32,240.17 485.32,248.73 484.73,257.27 483.57,265.75 481.83,274.14 479.52,282.38 476.65,290.45 473.24,298.30 469.30,305.90 464.85,313.22 459.91,320.21 454.51,326.86 448.67,333.11 442.41,338.96 435.77,344.36 428.77,349.30 421.46,353.75 413.85,357.69 406.00,361.10 397.93,363.96 389.69,366.27 381.31,368.02 372.82,369.18 364.28,369.77 355.72,369.77 347.18,369.18 338.69,368.02 330.31,366.27 322.07,363.96 314.00,361.10 306.15,357.69 298.54,353.75 291.23,349.30 284.23,344.36 277.59,338.96 271.33,333.11 265.49,326.86 260.09,320.21 255.15,313.22 250.70,305.90 246.76,298.30 243.35,290.45 240.48,282.38 238.17,274.14 236.43,265.75 235.27,257.27 234.68,248.73 234.68,240.17 235.27,231.62 236.43,223.14 238.17,214.76 240.48,206.51 243.35,198.45 246.76,190.59 250.70,182.99 255.15,175.68 260.09,168.68 265.49,162.04 271.33,155.78 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='448.67,155.78 454.51,162.04 459.91,168.68 464.85,175.68 469.30,182.99 473.24,190.59 476.65,198.45 479.52,206.51 481.83,214.76 483.57,223.14 484.73,231.62 485.32,240.17 485.32,248.73 484.73,257.27 483.57,265.75 481.83,274.14 479.52,282.38 476.65,290.45 473.24,298.30 469.30,305.90 464.85,313.22 459.91,320.21 454.51,326.86 448.67,333.11 442.41,338.96 435.77,344.36 428.77,349.30 421.46,353.75 413.85,357.69 406.00,361.10 397.93,363.96 389.69,366.27 381.31,368.02 372.82,369.18 364.28,369.77 355.72,369.77 347.18,369.18 338.69,368.02 330.31,366.27 322.07,363.96 314.00,361.10 306.15,357.69 298.54,353.75 291.23,349.30 284.23,344.36 277.59,338.96 271.33,333.11 265.49,326.86 260.09,320.21 255.15,313.22 250.70,305.90 246.76,298.30 243.35,290.45 240.48,282.38 238.17,274.14 236.43,265.75 235.27,257.27 234.68,248.73 234.68,240.17 235.27,231.62 236.43,223.14 238.17,214.76 240.48,206.51 243.35,198.45 246.76,190.59 250.70,182.99 255.15,175.68 260.09,168.68 265.49,162.04 271.33,155.78 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='457.30' y='262.24' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='351.05' y='342.38' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='261.68' y='243.53' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <polyline points='462.08,260.44 459.38,260.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='349.85,347.28 350.12,344.55 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='256.76,240.17 259.50,240.29 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='462.08,260.44 460.74,267.42 458.93,274.29 456.64,281.03 453.90,287.58 450.71,293.94 447.09,300.06 443.06,305.91 438.64,311.48 433.84,316.73 428.70,321.63 423.23,326.17 417.46,330.33 411.42,334.07 405.14,337.40 398.64,340.28 391.96,342.71 385.13,344.68 378.18,346.17 371.14,347.17 364.05,347.70 356.94,347.73 349.85,347.28 342.80,346.34 335.84,344.91 328.99,343.01 322.28,340.65 315.76,337.83 309.44,334.57 303.37,330.88 297.56,326.78 292.05,322.29 286.86,317.43 282.01,312.23 277.53,306.71 273.45,300.89 269.77,294.81 266.52,288.49 263.72,281.95 261.37,275.25 259.48,268.39 258.07,261.42 257.15,254.38 256.71,247.28 256.76,240.17 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='448.67,155.78 455.00,149.45 461.33,143.12 467.67,136.78 474.00,130.45 480.33,124.12 486.66,117.78 493.00,111.45 499.33,105.12 505.66,98.78 512.00,92.45 518.33,86.12 524.66,79.78 531.00,73.45 537.33,67.12 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='462.08,260.44 460.74,267.42 458.93,274.29 456.64,281.03 453.90,287.58 450.71,293.94 447.09,300.06 443.06,305.91 438.64,311.48 433.84,316.73 428.70,321.63 423.23,326.17 417.46,330.33 411.42,334.07 405.14,337.40 398.64,340.28 391.96,342.71 385.13,344.68 378.18,346.17 371.14,347.17 364.05,347.70 356.94,347.73 349.85,347.28 342.80,346.34 335.84,344.91 328.99,343.01 322.28,340.65 315.76,337.83 309.44,334.57 303.37,330.88 297.56,326.78 292.05,322.29 286.86,317.43 282.01,312.23 277.53,306.71 273.45,300.89 269.77,294.81 266.52,288.49 263.72,281.95 261.37,275.25 259.48,268.39 258.07,261.42 257.15,254.38 256.71,247.28 256.76,240.17 ' style='stroke-width: 1.07; stroke-linecap: square;' />
+<polyline points='448.67,155.78 455.00,149.45 461.33,143.12 467.67,136.78 474.00,130.45 480.33,124.12 486.66,117.78 493.00,111.45 499.33,105.12 505.66,98.78 512.00,92.45 518.33,86.12 524.66,79.78 531.00,73.45 537.33,67.12 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='455.02' y='142.45' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='475.13' y='122.35' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='495.23' y='102.24' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -108,7 +108,7 @@
 <polyline points='476.68,123.90 478.61,125.83 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='496.78,103.79 498.72,105.73 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='516.89,83.69 518.82,85.62 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='441.80,129.23 447.83,123.20 453.86,117.17 459.89,111.14 465.93,105.11 471.96,99.07 477.99,93.04 484.02,87.01 490.05,80.98 496.08,74.95 502.12,68.92 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='441.80,129.23 447.83,123.20 453.86,117.17 459.89,111.14 465.93,105.11 471.96,99.07 477.99,93.04 484.02,87.01 490.05,80.98 496.08,74.95 502.12,68.92 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='438.31' y='125.75' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
 <text x='458.42' y='105.64' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='478.52' y='85.53' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
@@ -117,7 +117,7 @@
 <polyline points='459.97,107.19 461.90,109.13 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='480.07,87.08 482.01,89.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='500.18,66.98 502.12,68.92 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.33,155.78 265.00,149.45 258.67,143.12 252.33,136.78 246.00,130.45 239.67,124.12 233.34,117.78 227.00,111.45 220.67,105.12 214.34,98.78 208.00,92.45 201.67,86.12 195.34,79.78 189.00,73.45 182.67,67.12 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='271.33,155.78 265.00,149.45 258.67,143.12 252.33,136.78 246.00,130.45 239.67,124.12 233.34,117.78 227.00,111.45 220.67,105.12 214.34,98.78 208.00,92.45 201.67,86.12 195.34,79.78 189.00,73.45 182.67,67.12 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='263.43,144.00 261.49,145.94 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='243.32,123.90 241.39,125.83 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='223.22,103.79 221.28,105.73 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
@@ -126,7 +126,7 @@
 <text x='244.87' y='122.35' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>200</text>
 <text x='224.77' y='102.24' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>300</text>
 <text x='204.66' y='82.14' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>400</text>
-<polyline points='278.20,129.23 272.17,123.20 266.14,117.17 260.11,111.14 254.07,105.11 248.04,99.07 242.01,93.04 235.98,87.01 229.95,80.98 223.92,74.95 217.88,68.92 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='278.20,129.23 272.17,123.20 266.14,117.17 260.11,111.14 254.07,105.11 248.04,99.07 242.01,93.04 235.98,87.01 229.95,80.98 223.92,74.95 217.88,68.92 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='280.14,127.30 278.20,129.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='260.03,107.19 258.10,109.13 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='239.93,87.08 237.99,89.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/theme/axes-styling.svg b/tests/testthat/_snaps/theme/axes-styling.svg
index 345db8bb68..632b6753d3 100644
--- a/tests/testthat/_snaps/theme/axes-styling.svg
+++ b/tests/testthat/_snaps/theme/axes-styling.svg
@@ -55,7 +55,7 @@
 <circle cx='650.79' cy='70.78' r='1.95' style='stroke-width: 0.71; fill: #000000;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<polyline points='40.13,48.19 679.87,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
+<polyline points='40.13,48.19 679.87,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: square;' />
 <polyline points='166.14,45.45 166.14,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
 <polyline points='327.69,45.45 327.69,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
 <polyline points='489.24,45.45 489.24,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
@@ -64,7 +64,7 @@
 <text x='327.69' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='489.24' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text x='650.79' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
-<polyline points='40.13,545.11 40.13,48.19 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
+<polyline points='40.13,545.11 40.13,48.19 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: square;' />
 <text x='35.20' y='450.26' text-anchor='end' style='font-size: 8.80px; fill: #0000FF; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='35.20' y='324.78' text-anchor='end' style='font-size: 8.80px; fill: #0000FF; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='35.20' y='199.29' text-anchor='end' style='font-size: 8.80px; fill: #0000FF; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
@@ -73,7 +73,7 @@
 <polyline points='37.39,321.75 40.13,321.75 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
 <polyline points='37.39,196.26 40.13,196.26 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
 <polyline points='37.39,70.78 40.13,70.78 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
-<polyline points='679.87,545.11 679.87,48.19 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
+<polyline points='679.87,545.11 679.87,48.19 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: square;' />
 <polyline points='682.61,447.23 679.87,447.23 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
 <polyline points='682.61,321.75 679.87,321.75 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
 <polyline points='682.61,196.26 679.87,196.26 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
@@ -82,7 +82,7 @@
 <text x='684.80' y='324.78' style='font-size: 8.80px; fill: #FFFF00; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='684.80' y='199.29' style='font-size: 8.80px; fill: #FFFF00; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text x='684.80' y='73.81' style='font-size: 8.80px; fill: #FFFF00; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
-<polyline points='40.13,545.11 679.87,545.11 ' style='stroke-width: 1.07; stroke: #00FF00; stroke-linecap: butt;' />
+<polyline points='40.13,545.11 679.87,545.11 ' style='stroke-width: 1.07; stroke: #00FF00; stroke-linecap: square;' />
 <polyline points='166.14,547.85 166.14,545.11 ' style='stroke-width: 1.07; stroke: #00FF00; stroke-linecap: butt;' />
 <polyline points='327.69,547.85 327.69,545.11 ' style='stroke-width: 1.07; stroke: #00FF00; stroke-linecap: butt;' />
 <polyline points='489.24,547.85 489.24,545.11 ' style='stroke-width: 1.07; stroke: #00FF00; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/theme/theme-classic-large.svg b/tests/testthat/_snaps/theme/theme-classic-large.svg
index 96767cc14f..e1f3f7c793 100644
--- a/tests/testthat/_snaps/theme/theme-classic-large.svg
+++ b/tests/testthat/_snaps/theme/theme-classic-large.svg
@@ -43,7 +43,7 @@
 <text x='347.56' y='102.41' text-anchor='middle' style='font-size: 26.40px; fill: #1A1A1A; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>1</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<polyline points='105.71,483.34 589.41,483.34 ' style='stroke-width: 3.20; stroke-linecap: butt;' />
+<polyline points='105.71,483.34 589.41,483.34 ' style='stroke-width: 3.20; stroke-linecap: square;' />
 <polyline points='127.70,491.56 127.70,483.34 ' style='stroke-width: 3.20; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='237.63,491.56 237.63,483.34 ' style='stroke-width: 3.20; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='347.56,491.56 347.56,483.34 ' style='stroke-width: 3.20; stroke: #333333; stroke-linecap: butt;' />
@@ -54,7 +54,7 @@
 <text x='347.56' y='516.30' text-anchor='middle' style='font-size: 26.40px; fill: #4D4D4D; font-family: sans;' textLength='36.70px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='457.49' y='516.30' text-anchor='middle' style='font-size: 26.40px; fill: #4D4D4D; font-family: sans;' textLength='36.70px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='567.42' y='516.30' text-anchor='middle' style='font-size: 26.40px; fill: #4D4D4D; font-family: sans;' textLength='36.70px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<polyline points='105.71,483.34 105.71,118.30 ' style='stroke-width: 3.20; stroke-linecap: butt;' />
+<polyline points='105.71,483.34 105.71,118.30 ' style='stroke-width: 3.20; stroke-linecap: square;' />
 <text x='90.92' y='475.83' text-anchor='end' style='font-size: 26.40px; fill: #4D4D4D; font-family: sans;' textLength='36.70px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='90.92' y='392.87' text-anchor='end' style='font-size: 26.40px; fill: #4D4D4D; font-family: sans;' textLength='36.70px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='90.92' y='309.90' text-anchor='end' style='font-size: 26.40px; fill: #4D4D4D; font-family: sans;' textLength='36.70px' lengthAdjust='spacingAndGlyphs'>2.0</text>
diff --git a/tests/testthat/_snaps/theme/theme-classic.svg b/tests/testthat/_snaps/theme/theme-classic.svg
index 8588be9819..d1a77a131e 100644
--- a/tests/testthat/_snaps/theme/theme-classic.svg
+++ b/tests/testthat/_snaps/theme/theme-classic.svg
@@ -43,7 +43,7 @@
 <text x='350.09' y='34.14' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<polyline points='35.24,545.11 664.95,545.11 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='35.24,545.11 664.95,545.11 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <polyline points='63.86,547.85 63.86,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='206.98,547.85 206.98,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='350.09,547.85 350.09,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
@@ -54,7 +54,7 @@
 <text x='350.09' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='493.21' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='636.33' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<polyline points='35.24,545.11 35.24,39.43 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='35.24,545.11 35.24,39.43 ' style='stroke-width: 1.07; stroke-linecap: square;' />
 <text x='30.31' y='525.16' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='30.31' y='410.23' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='30.31' y='295.30' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>