diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-0-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-0-linux.png
index 9bca6f17..8afd85d4 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-0-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-0-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-1-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-1-linux.png
index a40cf567..b0c5e5ec 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-1-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-1-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-2-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-2-linux.png
deleted file mode 100644
index 66e631ce..00000000
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-2-linux.png and /dev/null differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-3-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-3-linux.png
deleted file mode 100644
index 75e2b6b2..00000000
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-ipynb-cell-3-linux.png and /dev/null differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-0-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-0-linux.png
index 9bca6f17..8afd85d4 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-0-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-0-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-1-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-1-linux.png
index 50ddcbcf..33f3f966 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-1-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-1-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-10-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-10-linux.png
index ff894853..00cabb3e 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-10-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-10-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-11-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-11-linux.png
index 1a9a96f0..50a37f03 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-11-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-11-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-12-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-12-linux.png
index 50a37f03..33792bbc 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-12-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-12-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-2-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-2-linux.png
index 2d1ca5ca..3aa11e2d 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-2-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-2-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-3-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-3-linux.png
index d45d3eed..35b5929f 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-3-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-3-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-4-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-4-linux.png
index 4f43a7a2..0aae35bd 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-4-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-4-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-5-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-5-linux.png
index 23aad000..f46d1e1c 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-5-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-5-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-6-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-6-linux.png
index 1a9a96f0..50a37f03 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-6-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-6-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-7-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-7-linux.png
index 8f90fa06..b8795c7d 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-7-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-7-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-8-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-8-linux.png
index 0e692646..2c4915ad 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-8-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-8-linux.png differ
diff --git a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-9-linux.png b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-9-linux.png
index 306ee393..ae723dae 100644
Binary files a/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-9-linux.png and b/ui-tests/tests/ipympl.test.ts-snapshots/ipympl-update-ipynb-cell-9-linux.png differ
diff --git a/ui-tests/tests/notebooks/ipympl.ipynb b/ui-tests/tests/notebooks/ipympl.ipynb
index 5ac2924f..4757ac43 100644
--- a/ui-tests/tests/notebooks/ipympl.ipynb
+++ b/ui-tests/tests/notebooks/ipympl.ipynb
@@ -12,12 +12,14 @@
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
-    "fig = plt.figure()\n",
-    "plt.plot(np.sin(np.linspace(0, 20, 100)))\n",
+    "fig, ax = plt.subplots()\n",
     "\n",
     "# Remove text to avoid tiny differences in rendered output.\n",
     "from matplotlib.testing.decorators import remove_ticks_and_titles\n",
-    "remove_ticks_and_titles(fig)"
+    "remove_ticks_and_titles(fig)\n",
+    "fig.canvas.header_visible = False\n",
+    "\n",
+    "ax.plot(np.sin(np.linspace(0, 20, 100)));"
    ]
   },
   {
@@ -29,27 +31,6 @@
    "source": [
     "fig.canvas"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "9018cb24",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "fig.canvas.toolbar_visible = False\n",
-    "fig.canvas"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "46af41c8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "display(fig)"
-   ]
   }
  ],
  "metadata": {
diff --git a/ui-tests/tests/notebooks/ipympl_update.ipynb b/ui-tests/tests/notebooks/ipympl_update.ipynb
index 619ef129..c44cb4af 100644
--- a/ui-tests/tests/notebooks/ipympl_update.ipynb
+++ b/ui-tests/tests/notebooks/ipympl_update.ipynb
@@ -12,12 +12,14 @@
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
-    "fig = plt.figure()\n",
-    "plt.plot(np.sin(np.linspace(0, 20, 100)))\n",
+    "fig, ax = plt.subplots()\n",
     "\n",
     "# Remove text to avoid tiny differences in rendered output.\n",
     "from matplotlib.testing.decorators import remove_ticks_and_titles\n",
-    "remove_ticks_and_titles(fig)"
+    "remove_ticks_and_titles(fig)\n",
+    "fig.canvas.header_visible = False\n",
+    "\n",
+    "ax.plot(np.sin(np.linspace(0, 20, 100)));"
    ]
   },
   {
@@ -27,7 +29,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "plt.plot(np.cos(np.linspace(0, 20, 100)));"
+    "ax.plot(np.cos(np.linspace(0, 20, 100)));"
    ]
   },
   {
@@ -130,16 +132,6 @@
     "fig.canvas.toolbar.button_style = ''"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "0d86fce3",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "fig.canvas.header_visible = False"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,