diff --git a/assets/css/images/empty-contact.png b/assets/css/images/empty-contact.png
deleted file mode 100644
index b2f2071d1..000000000
Binary files a/assets/css/images/empty-contact.png and /dev/null differ
diff --git a/dev/Stores/User/Notification.js b/dev/Stores/User/Notification.js
index 76a46f8b6..32335ef33 100644
--- a/dev/Stores/User/Notification.js
+++ b/dev/Stores/User/Notification.js
@@ -57,7 +57,7 @@ export const NotificationUserStore = new class {
 		if (DesktopNotifications && NotificationsGranted()) {
 			const options = {
 				body: text,
-				icon: imageSrc || Links.staticLink('css/images/icon-message-notification.png'),
+				icon: imageSrc || Links.staticLink('images/icon-message-notification.png'),
 				data: messageData
 			};
 			if (messageData?.uid) {
diff --git a/dev/Styles/Admin/About.less b/dev/Styles/Admin/About.less
index 73d0991cd..945f04738 100644
--- a/dev/Styles/Admin/About.less
+++ b/dev/Styles/Admin/About.less
@@ -4,6 +4,7 @@
 		display: inline-block;
 		width: 250px;
 		height: 200px;
-		background: url("images/snappymail-logo.png") -30px -30px;
+		/* Yes this LESS css relative path quirk becomes ../ */
+		background: url(../../images/snappymail-logo.png) -30px -30px;
 	}
 }
diff --git a/gulpfile.js b/gulpfile.js
index e6cf1c2ed..9b0d1bbb4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,7 +2,6 @@
 const gulp = require('gulp');
 
 const { cleanStatic } = require('./tasks/common');
-const { assets } = require('./tasks/assets');
 const { js, jsLint } = require('./tasks/js');
 const { css, cssLint } = require('./tasks/css');
 const { vendors } = require('./tasks/vendors');
@@ -12,7 +11,7 @@ const clean = gulp.series(cleanStatic);
 const lint = gulp.parallel(jsLint, cssLint);
 
 const buildState1 = gulp.parallel(js, css, vendors);
-const buildState2 = gulp.series(clean, assets, buildState1);
+const buildState2 = gulp.series(clean, buildState1);
 
 const build = gulp.parallel(lint, buildState2);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index da5d154b9..fc4236d3a 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -500,11 +500,13 @@ trait Messages
 			try
 			{
 				if ('SPAM' === $sLearning) {
+//					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk');
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK);
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK, false);
 				} else if ('HAM' === $sLearning) {
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK);
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK, false);
+//					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk', false);
 				}
 			}
 			catch (\Throwable $oException)
diff --git a/assets/.htaccess b/snappymail/v/0.0.0/static/.htaccess
similarity index 100%
rename from assets/.htaccess
rename to snappymail/v/0.0.0/static/.htaccess
diff --git a/assets/android-icon.png b/snappymail/v/0.0.0/static/android-icon.png
similarity index 100%
rename from assets/android-icon.png
rename to snappymail/v/0.0.0/static/android-icon.png
diff --git a/assets/apple-touch-icon.png b/snappymail/v/0.0.0/static/apple-touch-icon.png
similarity index 100%
rename from assets/apple-touch-icon.png
rename to snappymail/v/0.0.0/static/apple-touch-icon.png
diff --git a/assets/favicon-light.ico b/snappymail/v/0.0.0/static/favicon-light.ico
similarity index 100%
rename from assets/favicon-light.ico
rename to snappymail/v/0.0.0/static/favicon-light.ico
diff --git a/assets/favicon-light.png b/snappymail/v/0.0.0/static/favicon-light.png
similarity index 100%
rename from assets/favicon-light.png
rename to snappymail/v/0.0.0/static/favicon-light.png
diff --git a/assets/favicon.ico b/snappymail/v/0.0.0/static/favicon.ico
similarity index 100%
rename from assets/favicon.ico
rename to snappymail/v/0.0.0/static/favicon.ico
diff --git a/assets/favicon.png b/snappymail/v/0.0.0/static/favicon.png
similarity index 100%
rename from assets/favicon.png
rename to snappymail/v/0.0.0/static/favicon.png
diff --git a/assets/favicon.svg b/snappymail/v/0.0.0/static/favicon.svg
similarity index 100%
rename from assets/favicon.svg
rename to snappymail/v/0.0.0/static/favicon.svg
diff --git a/assets/css/images/icon-message-notification.png b/snappymail/v/0.0.0/static/images/icon-message-notification.png
similarity index 100%
rename from assets/css/images/icon-message-notification.png
rename to snappymail/v/0.0.0/static/images/icon-message-notification.png
diff --git a/assets/css/images/snappymail-logo.png b/snappymail/v/0.0.0/static/images/snappymail-logo.png
similarity index 100%
rename from assets/css/images/snappymail-logo.png
rename to snappymail/v/0.0.0/static/images/snappymail-logo.png
diff --git a/assets/logo-512.png b/snappymail/v/0.0.0/static/logo-512.png
similarity index 100%
rename from assets/logo-512.png
rename to snappymail/v/0.0.0/static/logo-512.png
diff --git a/assets/manifest.json b/snappymail/v/0.0.0/static/manifest.json
similarity index 100%
rename from assets/manifest.json
rename to snappymail/v/0.0.0/static/manifest.json
diff --git a/assets/sounds/alert.mp3 b/snappymail/v/0.0.0/static/sounds/alert.mp3
similarity index 100%
rename from assets/sounds/alert.mp3
rename to snappymail/v/0.0.0/static/sounds/alert.mp3
diff --git a/assets/sounds/alert.ogg b/snappymail/v/0.0.0/static/sounds/alert.ogg
similarity index 100%
rename from assets/sounds/alert.ogg
rename to snappymail/v/0.0.0/static/sounds/alert.ogg
diff --git a/assets/sounds/new-mail.mp3 b/snappymail/v/0.0.0/static/sounds/new-mail.mp3
similarity index 100%
rename from assets/sounds/new-mail.mp3
rename to snappymail/v/0.0.0/static/sounds/new-mail.mp3
diff --git a/assets/sounds/new-mail.ogg b/snappymail/v/0.0.0/static/sounds/new-mail.ogg
similarity index 100%
rename from assets/sounds/new-mail.ogg
rename to snappymail/v/0.0.0/static/sounds/new-mail.ogg
diff --git a/assets/sounds/ping.mp3 b/snappymail/v/0.0.0/static/sounds/ping.mp3
similarity index 100%
rename from assets/sounds/ping.mp3
rename to snappymail/v/0.0.0/static/sounds/ping.mp3
diff --git a/assets/sounds/ping.ogg b/snappymail/v/0.0.0/static/sounds/ping.ogg
similarity index 100%
rename from assets/sounds/ping.ogg
rename to snappymail/v/0.0.0/static/sounds/ping.ogg
diff --git a/tasks/assets.js b/tasks/assets.js
deleted file mode 100644
index 0f967dc84..000000000
--- a/tasks/assets.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
-const gulp = require('gulp');
-const { config } = require('./config');
-
-const assetsCopy = () => gulp.src(config.paths.assets.src).pipe(gulp.dest(config.paths.static));
-
-exports.assets = gulp.series(assetsCopy);
diff --git a/tasks/common.js b/tasks/common.js
index 1f88d14ed..d1f8dfdb8 100644
--- a/tasks/common.js
+++ b/tasks/common.js
@@ -14,4 +14,4 @@ exports.copy = (sFile, sNewFile, done) => {
 
 exports.getHead = () => config.head.agpl;
 
-exports.cleanStatic = () => del(config.paths.static);
+exports.cleanStatic = () => del(config.paths.staticJS) && del(config.paths.staticCSS);
diff --git a/tasks/config.js b/tasks/config.js
index 99dd40a6a..638390983 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -14,15 +14,10 @@ const config = {
 };
 
 config.paths.globjs = 'dev/**/*.js';
-config.paths.static = 'snappymail/v/' + config.devVersion + '/static/';
 config.paths.staticJS = 'snappymail/v/' + config.devVersion + '/static/js/';
 config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min/';
 config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/';
 
-config.paths.assets = {
-	src: ['assets/**/*.*', 'assets/**/.htaccess']
-};
-
 config.paths.less = {
 	main: {
 		src: 'dev/Styles/@Main.less',