diff --git a/makefile b/makefile
index d963047354ea..1e6ee59598dc 100644
--- a/makefile
+++ b/makefile
@@ -85,7 +85,7 @@ coverage: install
 
 # Validate all assets.
 validate: install
-	@./tools/task-runner/runner.mjs validate --verbose
+	@./tools/task-runner/runner.mjs validate/index.mjs --verbose
 	@yarn prettier */test/resources/*.json --check
 
 # Validate all SCSS.
diff --git a/static/public/images/email/banners/morning-mail.png b/static/public/images/email/banners/morning-mail.png
index 14c2ab01704d..be38f4c350ad 100644
Binary files a/static/public/images/email/banners/morning-mail.png and b/static/public/images/email/banners/morning-mail.png differ
diff --git a/tools/__tasks__/compile/images/icons.mjs b/tools/__tasks__/compile/images/icons.mjs
index b3923a499dc6..49f44d88f70a 100644
--- a/tools/__tasks__/compile/images/icons.mjs
+++ b/tools/__tasks__/compile/images/icons.mjs
@@ -10,6 +10,7 @@ import glob from 'glob';
 import btoa from 'btoa';
 import { optimize } from 'svgo';
 import mkdirp from 'mkdirp';
+import { fileURLToPath } from 'url';
 
 const getSVG = iconPath =>
     new Promise((resolve, reject) => {
@@ -80,7 +81,7 @@ const saveSass = (sass, dest, fileName) =>
             path.join(dest, fileName),
             `
                 // THIS FILE WAS AUTOMATICALLY GENERATED BY
-                // ${path.relative(root, path.resolve(__filename))}
+                // ${path.relative(root, fileURLToPath(import.meta.url))}
                 // DO NOT EDIT IT!
 
                 @if ($svg-support) {
diff --git a/tools/__tasks__/compile/index.mjs b/tools/__tasks__/compile/index.mjs
index ece7f7cb1f9f..557c721560d9 100755
--- a/tools/__tasks__/compile/index.mjs
+++ b/tools/__tasks__/compile/index.mjs
@@ -1,11 +1,11 @@
 export default {
   description: 'Compile assets for production',
   task: [
-    await import('./conf/clean.mjs').then(module => module.default),
-    await import('./css/index.mjs').then(module => module.default),
-    await import('./data/index.mjs').then(module => module.default),
-    await import('./javascript/index.mjs').then(module => module.default),
-    await import('./hash/index.mjs').then(module => module.default),
-    await import('./conf/index.mjs').then(module => module.default),
+    await import('./conf/clean.mjs'),
+    await import('./css/index.mjs'),
+    await import('./data/index.mjs'),
+    await import('./javascript/index.mjs'),
+    await import('./hash/index.mjs'),
+    await import('./conf/index.mjs'),
   ],
 }
diff --git a/tools/__tasks__/compile/javascript/index.mjs b/tools/__tasks__/compile/javascript/index.mjs
index e597744731dd..068b5db9c131 100644
--- a/tools/__tasks__/compile/javascript/index.mjs
+++ b/tools/__tasks__/compile/javascript/index.mjs
@@ -4,8 +4,8 @@ export default {
       await import('./clean.mjs').then(module => module.default),
       await import('../inline-svgs/index.mjs').then(module => module.default),
       await import('./copy.mjs').then(module => module.default),
-      await import('./webpack.js').then(module => module.default),
-      await import('./webpack-atoms.js').then(module => module.default),
+      await import('./webpack.mjs').then(module => module.default),
+      await import('./webpack-atoms.mjs').then(module => module.default),
       await import('./bundle-polyfills.mjs').then(module => module.default),
   ],
 };
diff --git a/tools/__tasks__/compile/javascript/index.watch.mjs b/tools/__tasks__/compile/javascript/index.watch.mjs
index e3067054fd9b..6e9bba5aaa32 100644
--- a/tools/__tasks__/compile/javascript/index.watch.mjs
+++ b/tools/__tasks__/compile/javascript/index.watch.mjs
@@ -1,9 +1,9 @@
 export default {
     description: 'Prepare JS for development',
     task: [
-        (await import('../inline-svgs/index.mjs')).then(module => module.default),
-        (await import('./clean.mjs')).then(module => module.default),
-        (await import('./copy.mjs')).then(module => module.default),
-        (await import('./bundle-polyfills.mjs')).then(module => module.default),
+        await import('../inline-svgs/index.mjs').then(module => module.default),
+        await import('./clean.mjs').then(module => module.default),
+        await import('./copy.mjs').then(module => module.default),
+        await import('./bundle-polyfills.mjs').then(module => module.default),
     ],
 };
diff --git a/tools/__tasks__/validate/index.mjs b/tools/__tasks__/validate/index.mjs
index 46159d06de88..8dd045af3b4f 100644
--- a/tools/__tasks__/validate/index.mjs
+++ b/tools/__tasks__/validate/index.mjs
@@ -1,10 +1,10 @@
 export default {
     description: 'Lint assets',
     task: [
-        import('./javascript.mjs'),
-        import('./typescript.mjs'),
-        import('./sass.mjs'),
-        import('./check-for-disallowed-strings.mjs'),
+        await import('./javascript.mjs'),
+        await import('./typescript.mjs'),
+        await import('./sass.mjs'),
+        await import('./check-for-disallowed-strings.mjs'),
     ],
     concurrent: true,
 };